aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Grob <H.Grob@physik.uni-muenchen.de>2013-02-06 05:37:20 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-02-06 14:21:51 -0500
commit890537b3ac953ad2cc4f5ecb83744e967ae2aa31 (patch)
tree56a1c2a7eaf3dbbd4aca12c3cc1a4898e03de1d2
parent0731572b6c529f8e8a320dc4df6d67d9a595ecf3 (diff)
drivers/char/mem.c: fix small coding style issues
This patch fixes four foo * bar errors, and one trailing whitespace complaint from checkpatch.pl Signed-off-by: Hans Grob <H.Grob@physik.uni-muenchen.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/char/mem.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index c6fa3bc2baa8..6f6e92a3102d 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -399,7 +399,7 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
399{ 399{
400 unsigned long p = *ppos; 400 unsigned long p = *ppos;
401 ssize_t low_count, read, sz; 401 ssize_t low_count, read, sz;
402 char * kbuf; /* k-addr because vread() takes vmlist_lock rwlock */ 402 char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
403 int err = 0; 403 int err = 0;
404 404
405 read = 0; 405 read = 0;
@@ -527,7 +527,7 @@ static ssize_t write_kmem(struct file *file, const char __user *buf,
527 unsigned long p = *ppos; 527 unsigned long p = *ppos;
528 ssize_t wrote = 0; 528 ssize_t wrote = 0;
529 ssize_t virtr = 0; 529 ssize_t virtr = 0;
530 char * kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */ 530 char *kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */
531 int err = 0; 531 int err = 0;
532 532
533 if (p < (unsigned long) high_memory) { 533 if (p < (unsigned long) high_memory) {
@@ -595,7 +595,7 @@ static ssize_t write_port(struct file *file, const char __user *buf,
595 size_t count, loff_t *ppos) 595 size_t count, loff_t *ppos)
596{ 596{
597 unsigned long i = *ppos; 597 unsigned long i = *ppos;
598 const char __user * tmp = buf; 598 const char __user *tmp = buf;
599 599
600 if (!access_ok(VERIFY_READ, buf, count)) 600 if (!access_ok(VERIFY_READ, buf, count))
601 return -EFAULT; 601 return -EFAULT;
@@ -729,7 +729,7 @@ static loff_t memory_lseek(struct file *file, loff_t offset, int orig)
729 return ret; 729 return ret;
730} 730}
731 731
732static int open_port(struct inode * inode, struct file * filp) 732static int open_port(struct inode *inode, struct file *filp)
733{ 733{
734 return capable(CAP_SYS_RAWIO) ? 0 : -EPERM; 734 return capable(CAP_SYS_RAWIO) ? 0 : -EPERM;
735} 735}
@@ -898,7 +898,7 @@ static int __init chr_dev_init(void)
898 continue; 898 continue;
899 899
900 /* 900 /*
901 * Create /dev/port? 901 * Create /dev/port?
902 */ 902 */
903 if ((minor == DEVPORT_MINOR) && !arch_has_dev_port()) 903 if ((minor == DEVPORT_MINOR) && !arch_has_dev_port())
904 continue; 904 continue;