diff options
author | Nanakos Chrysostomos <nanakos@wired-net.gr> | 2010-05-27 16:19:52 +0000 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-18 16:41:17 -0700 |
commit | ef079a76fe78d713eb695a222601fccb3e706f0f (patch) | |
tree | e033f64056de21beda7fb93a6f2d167e1bb7834a /drivers/staging/dream | |
parent | Staging: cx25821: added KERN_ facility levels (diff) | |
download | linux-dev-ef079a76fe78d713eb695a222601fccb3e706f0f.tar.xz linux-dev-ef079a76fe78d713eb695a222601fccb3e706f0f.zip |
Staging: dream: pmem.c: Fix checkpatch.pl issues.
This patch resolves checkpatch.pl issues in the pmem.c file.
Signed-off-by: Nanakos Chrysostomos <nanakos@wired-net.gr>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/dream')
-rw-r--r-- | drivers/staging/dream/pmem.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/dream/pmem.c b/drivers/staging/dream/pmem.c index 6387365a833d..064b59e5b500 100644 --- a/drivers/staging/dream/pmem.c +++ b/drivers/staging/dream/pmem.c @@ -24,8 +24,8 @@ #include <linux/mempolicy.h> #include <linux/sched.h> #include <linux/slab.h> -#include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/io.h> +#include <linux/uaccess.h> #include <asm/cacheflush.h> #define PMEM_MAX_DEVICES 10 @@ -175,7 +175,7 @@ static int pmem_mmap(struct file *, struct vm_area_struct *); static int pmem_open(struct inode *, struct file *); static long pmem_ioctl(struct file *, unsigned int, unsigned long); -struct file_operations pmem_fops = { +const struct file_operations pmem_fops = { .release = pmem_release, .mmap = pmem_mmap, .open = pmem_open, @@ -399,8 +399,8 @@ static int pmem_allocate(int id, unsigned long len) DLOG("order %lx\n", order); /* look through the bitmap: - * if you find a free slot of the correct order use it - * otherwise, use the best fit (smallest with size > order) slot + * if you find a free slot of the correct order use it + * otherwise, use the best fit (smallest with size > order) slot */ while (curr < end) { if (PMEM_IS_FREE(id, curr)) { @@ -426,8 +426,8 @@ static int pmem_allocate(int id, unsigned long len) } /* now partition the best fit: - * split the slot into 2 buddies of order - 1 - * repeat until the slot is of the correct order + * split the slot into 2 buddies of order - 1 + * repeat until the slot is of the correct order */ while (PMEM_ORDER(id, best_fit) > (unsigned char)order) { int buddy; |