summaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorSudip Mukherjee <sudipm.mukherjee@gmail.com>2016-02-12 16:03:43 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-15 04:43:50 +0300
commita7c71c07a31fde429627f0c7eed5fb57cb986fa6 (patch)
tree42a46d88f068c6d54d20e545b58d4455b8b475a5 /drivers/char
parent83e80605cc3ce6a2ac966151cd515f691e4835e0 (diff)
downloadlinux-a7c71c07a31fde429627f0c7eed5fb57cb986fa6.tar.xz
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)
}
static ssize_t pp_read(struct file *file, char __user *buf, size_t count,
- loff_t *ppos)
+ loff_t *ppos)
{
unsigned int minor = iminor(file_inode(file));
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,
mode = pport->ieee1284.mode & ~(IEEE1284_DEVICEID | IEEE1284_ADDR);
parport_set_timeout(pp->pdev,
- (file->f_flags & O_NONBLOCK) ?
- PARPORT_INACTIVITY_O_NONBLOCK :
- pp->default_inactivity);
+ (file->f_flags & O_NONBLOCK) ?
+ PARPORT_INACTIVITY_O_NONBLOCK :
+ pp->default_inactivity);
while (bytes_read == 0) {
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,
}
static ssize_t pp_write(struct file *file, const char __user *buf,
- size_t count, loff_t *ppos)
+ size_t count, loff_t *ppos)
{
unsigned int minor = iminor(file_inode(file));
struct pp_struct *pp = file->private_data;
@@ -216,9 +216,9 @@ static ssize_t pp_write(struct file *file, const char __user *buf,
mode = pport->ieee1284.mode & ~(IEEE1284_DEVICEID | IEEE1284_ADDR);
parport_set_timeout(pp->pdev,
- (file->f_flags & O_NONBLOCK) ?
- PARPORT_INACTIVITY_O_NONBLOCK :
- pp->default_inactivity);
+ (file->f_flags & O_NONBLOCK) ?
+ PARPORT_INACTIVITY_O_NONBLOCK :
+ pp->default_inactivity);
while (bytes_written < count) {
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)
fl = (pp->flags & PP_EXCL) ? PARPORT_FLAG_EXCL : 0;
pdev = parport_register_device(port, name, NULL,
- NULL, pp_irq, fl, pp);
+ NULL, pp_irq, fl, pp);
parport_put_port(port);
if (!pdev) {
@@ -559,10 +559,10 @@ static int pp_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
case PPFCONTROL:
if (copy_from_user(&mask, argp,
- sizeof(mask)))
+ sizeof(mask)))
return -EFAULT;
if (copy_from_user(&reg, 1 + (unsigned char __user *) arg,
- sizeof(reg)))
+ sizeof(reg)))
return -EFAULT;
parport_frob_control(port, mask, reg);
return 0;
@@ -665,7 +665,7 @@ static long pp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
#ifdef CONFIG_COMPAT
static long pp_compat_ioctl(struct file *file, unsigned int cmd,
- unsigned long arg)
+ unsigned long arg)
{
return pp_ioctl(file, cmd, (unsigned long)compat_ptr(arg));
}
@@ -811,7 +811,7 @@ static int __init ppdev_init(void)
if (register_chrdev(PP_MAJOR, CHRDEV, &pp_fops)) {
printk(KERN_WARNING CHRDEV ": unable to get major %d\n",
- PP_MAJOR);
+ PP_MAJOR);
return -EIO;
}
ppdev_class = class_create(THIS_MODULE, CHRDEV);