aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorSudip Mukherjee <sudipm.mukherjee@gmail.com>2016-02-12 08:03:43 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-14 20:43:50 -0500
commita7c71c07a31fde429627f0c7eed5fb57cb986fa6 (patch)
tree42a46d88f068c6d54d20e545b58d4455b8b475a5 /drivers/char
parent83e80605cc3ce6a2ac966151cd515f691e4835e0 (diff)
ppdev: fix parenthesis alignment
checkpatch was complaining that the alignment was not matching with the open parenthesis. Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/ppdev.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index dfb419772038..39dedb775d5f 100644
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -114,7 +114,7 @@ static inline void pp_enable_irq(struct pp_struct *pp)
114} 114}
115 115
116static ssize_t pp_read(struct file *file, char __user *buf, size_t count, 116static ssize_t pp_read(struct file *file, char __user *buf, size_t count,
117 loff_t *ppos) 117 loff_t *ppos)
118{ 118{
119 unsigned int minor = iminor(file_inode(file)); 119 unsigned int minor = iminor(file_inode(file));
120 struct pp_struct *pp = file->private_data; 120 struct pp_struct *pp = file->private_data;
@@ -140,9 +140,9 @@ static ssize_t pp_read(struct file *file, char __user *buf, size_t count,
140 mode = pport->ieee1284.mode & ~(IEEE1284_DEVICEID | IEEE1284_ADDR); 140 mode = pport->ieee1284.mode & ~(IEEE1284_DEVICEID | IEEE1284_ADDR);
141 141
142 parport_set_timeout(pp->pdev, 142 parport_set_timeout(pp->pdev,
143 (file->f_flags & O_NONBLOCK) ? 143 (file->f_flags & O_NONBLOCK) ?
144 PARPORT_INACTIVITY_O_NONBLOCK : 144 PARPORT_INACTIVITY_O_NONBLOCK :
145 pp->default_inactivity); 145 pp->default_inactivity);
146 146
147 while (bytes_read == 0) { 147 while (bytes_read == 0) {
148 ssize_t need = min_t(unsigned long, count, PP_BUFFER_SIZE); 148 ssize_t need = min_t(unsigned long, count, PP_BUFFER_SIZE);
@@ -192,7 +192,7 @@ static ssize_t pp_read(struct file *file, char __user *buf, size_t count,
192} 192}
193 193
194static ssize_t pp_write(struct file *file, const char __user *buf, 194static ssize_t pp_write(struct file *file, const char __user *buf,
195 size_t count, loff_t *ppos) 195 size_t count, loff_t *ppos)
196{ 196{
197 unsigned int minor = iminor(file_inode(file)); 197 unsigned int minor = iminor(file_inode(file));
198 struct pp_struct *pp = file->private_data; 198 struct pp_struct *pp = file->private_data;
@@ -216,9 +216,9 @@ static ssize_t pp_write(struct file *file, const char __user *buf,
216 mode = pport->ieee1284.mode & ~(IEEE1284_DEVICEID | IEEE1284_ADDR); 216 mode = pport->ieee1284.mode & ~(IEEE1284_DEVICEID | IEEE1284_ADDR);
217 217
218 parport_set_timeout(pp->pdev, 218 parport_set_timeout(pp->pdev,
219 (file->f_flags & O_NONBLOCK) ? 219 (file->f_flags & O_NONBLOCK) ?
220 PARPORT_INACTIVITY_O_NONBLOCK : 220 PARPORT_INACTIVITY_O_NONBLOCK :
221 pp->default_inactivity); 221 pp->default_inactivity);
222 222
223 while (bytes_written < count) { 223 while (bytes_written < count) {
224 ssize_t n = min_t(unsigned long, count - bytes_written, PP_BUFFER_SIZE); 224 ssize_t n = min_t(unsigned long, count - bytes_written, PP_BUFFER_SIZE);
@@ -301,7 +301,7 @@ static int register_device(int minor, struct pp_struct *pp)
301 301
302 fl = (pp->flags & PP_EXCL) ? PARPORT_FLAG_EXCL : 0; 302 fl = (pp->flags & PP_EXCL) ? PARPORT_FLAG_EXCL : 0;
303 pdev = parport_register_device(port, name, NULL, 303 pdev = parport_register_device(port, name, NULL,
304 NULL, pp_irq, fl, pp); 304 NULL, pp_irq, fl, pp);
305 parport_put_port(port); 305 parport_put_port(port);
306 306
307 if (!pdev) { 307 if (!pdev) {
@@ -559,10 +559,10 @@ static int pp_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
559 559
560 case PPFCONTROL: 560 case PPFCONTROL:
561 if (copy_from_user(&mask, argp, 561 if (copy_from_user(&mask, argp,
562 sizeof(mask))) 562 sizeof(mask)))
563 return -EFAULT; 563 return -EFAULT;
564 if (copy_from_user(&reg, 1 + (unsigned char __user *) arg, 564 if (copy_from_user(&reg, 1 + (unsigned char __user *) arg,
565 sizeof(reg))) 565 sizeof(reg)))
566 return -EFAULT; 566 return -EFAULT;
567 parport_frob_control(port, mask, reg); 567 parport_frob_control(port, mask, reg);
568 return 0; 568 return 0;
@@ -665,7 +665,7 @@ static long pp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
665 665
666#ifdef CONFIG_COMPAT 666#ifdef CONFIG_COMPAT
667static long pp_compat_ioctl(struct file *file, unsigned int cmd, 667static long pp_compat_ioctl(struct file *file, unsigned int cmd,
668 unsigned long arg) 668 unsigned long arg)
669{ 669{
670 return pp_ioctl(file, cmd, (unsigned long)compat_ptr(arg)); 670 return pp_ioctl(file, cmd, (unsigned long)compat_ptr(arg));
671} 671}
@@ -811,7 +811,7 @@ static int __init ppdev_init(void)
811 811
812 if (register_chrdev(PP_MAJOR, CHRDEV, &pp_fops)) { 812 if (register_chrdev(PP_MAJOR, CHRDEV, &pp_fops)) {
813 printk(KERN_WARNING CHRDEV ": unable to get major %d\n", 813 printk(KERN_WARNING CHRDEV ": unable to get major %d\n",
814 PP_MAJOR); 814 PP_MAJOR);
815 return -EIO; 815 return -EIO;
816 } 816 }
817 ppdev_class = class_create(THIS_MODULE, CHRDEV); 817 ppdev_class = class_create(THIS_MODULE, CHRDEV);