diff options
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/drm_proc.c | 8 | ||||
| -rw-r--r-- | linux-core/drm_scatter.c | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/linux-core/drm_proc.c b/linux-core/drm_proc.c index 8e9c4759..52241bd4 100644 --- a/linux-core/drm_proc.c +++ b/linux-core/drm_proc.c @@ -175,8 +175,8 @@ static int drm_name_info(char *buf, char **start, off_t offset, int request, if (dev->unique) { DRM_PROC_PRINT("%s %s %s\n", - dev->driver->pci_driver.name, pci_name(dev->pdev), - dev->unique); + dev->driver->pci_driver.name, + pci_name(dev->pdev), dev->unique); } else { DRM_PROC_PRINT("%s %s\n", dev->driver->pci_driver.name, pci_name(dev->pdev)); @@ -241,9 +241,7 @@ static int drm__vm_info(char *buf, char **start, off_t offset, int request, DRM_PROC_PRINT("%4d 0x%08lx 0x%08lx %4.4s 0x%02x 0x%08x ", i, map->offset, - map->size, - type, map->flags, - r_list->user_token); + map->size, type, map->flags, r_list->user_token); if (map->mtrr < 0) { DRM_PROC_PRINT("none\n"); diff --git a/linux-core/drm_scatter.c b/linux-core/drm_scatter.c index 1647303d..a7144f1a 100644 --- a/linux-core/drm_scatter.c +++ b/linux-core/drm_scatter.c @@ -33,7 +33,6 @@ #include <linux/config.h> #include <linux/vmalloc.h> - #include "drmP.h" #define DEBUG_SCATTER 0 @@ -137,7 +136,7 @@ int drm_sg_alloc(struct inode *inode, struct file *filp, DRM_DEBUG("sg alloc virtual = %p\n", entry->virtual); for (i = (unsigned long)entry->virtual, j = 0; j < pages; - i += PAGE_SIZE, j++) { + i += PAGE_SIZE, j++) { entry->pagelist[j] = vmalloc_to_page((void *)i); if (!entry->pagelist[j]) goto failed; |