Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933004AbbFWNVq (ORCPT ); Tue, 23 Jun 2015 09:21:46 -0400 Received: from mail-wi0-f174.google.com ([209.85.212.174]:37975 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932785AbbFWNVi (ORCPT ); Tue, 23 Jun 2015 09:21:38 -0400 MIME-Version: 1.0 In-Reply-To: <1435063353-25914-2-git-send-email-dmitry.kalinkin@gmail.com> References: <1435063353-25914-1-git-send-email-dmitry.kalinkin@gmail.com> <1435063353-25914-2-git-send-email-dmitry.kalinkin@gmail.com> Date: Tue, 23 Jun 2015 15:21:37 +0200 Message-ID: Subject: Re: [PATCH 1/9] staging: vme_user: fix code alignment From: Frans Klaver To: Dmitry Kalinkin Cc: "linux-kernel@vger.kernel.org" , devel@driverdev.osuosl.org, Martyn Welch , Manohar Vanga , Greg Kroah-Hartman Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 6246 Lines: 134 On Tue, Jun 23, 2015 at 2:42 PM, Dmitry Kalinkin wrote: > Signed-off-by: Dmitry Kalinkin You left one in the function declarations (vme_user_write). > --- > drivers/staging/vme/devices/vme_user.c | 33 +++++++++++++++++---------------- > 1 file changed, 17 insertions(+), 16 deletions(-) > > diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c > index 5ff44fb..285e00e 100644 > --- a/drivers/staging/vme/devices/vme_user.c > +++ b/drivers/staging/vme/devices/vme_user.c > @@ -128,7 +128,7 @@ struct vme_user_vma_priv { > * transfer the data directly into the user space buffers. > */ > static ssize_t resource_to_user(int minor, char __user *buf, size_t count, > - loff_t *ppos) > + loff_t *ppos) > { > ssize_t retval; > ssize_t copied = 0; > @@ -167,7 +167,7 @@ static ssize_t resource_to_user(int minor, char __user *buf, size_t count, > * transfer the data directly from the user space buffers out to VME. > */ > static ssize_t resource_from_user(unsigned int minor, const char __user *buf, > - size_t count, loff_t *ppos) > + size_t count, loff_t *ppos) > { > ssize_t retval; > ssize_t copied = 0; > @@ -195,7 +195,7 @@ static ssize_t resource_from_user(unsigned int minor, const char __user *buf, > } > > static ssize_t buffer_to_user(unsigned int minor, char __user *buf, > - size_t count, loff_t *ppos) > + size_t count, loff_t *ppos) > { > void *image_ptr; > ssize_t retval; > @@ -214,7 +214,7 @@ static ssize_t buffer_to_user(unsigned int minor, char __user *buf, > } > > static ssize_t buffer_from_user(unsigned int minor, const char __user *buf, > - size_t count, loff_t *ppos) > + size_t count, loff_t *ppos) > { > void *image_ptr; > size_t retval; > @@ -233,7 +233,7 @@ static ssize_t buffer_from_user(unsigned int minor, const char __user *buf, > } > > static ssize_t vme_user_read(struct file *file, char __user *buf, size_t count, > - loff_t *ppos) > + loff_t *ppos) > { > unsigned int minor = MINOR(file_inode(file)->i_rdev); > ssize_t retval; > @@ -279,7 +279,7 @@ static ssize_t vme_user_read(struct file *file, char __user *buf, size_t count, > } > > static ssize_t vme_user_write(struct file *file, const char __user *buf, > - size_t count, loff_t *ppos) > + size_t count, loff_t *ppos) > { > unsigned int minor = MINOR(file_inode(file)->i_rdev); > ssize_t retval; > @@ -354,7 +354,7 @@ static loff_t vme_user_llseek(struct file *file, loff_t off, int whence) > * already been defined. > */ > static int vme_user_ioctl(struct inode *inode, struct file *file, > - unsigned int cmd, unsigned long arg) > + unsigned int cmd, unsigned long arg) > { > struct vme_master master; > struct vme_slave slave; > @@ -390,12 +390,13 @@ static int vme_user_ioctl(struct inode *inode, struct file *file, > * to userspace as they are > */ > retval = vme_master_get(image[minor].resource, > - &master.enable, &master.vme_addr, > - &master.size, &master.aspace, > - &master.cycle, &master.dwidth); > + &master.enable, > + &master.vme_addr, > + &master.size, &master.aspace, > + &master.cycle, &master.dwidth); > > copied = copy_to_user(argp, &master, > - sizeof(struct vme_master)); > + sizeof(struct vme_master)); > if (copied != 0) { > pr_warn("Partial copy to userspace\n"); > return -EFAULT; > @@ -435,12 +436,12 @@ static int vme_user_ioctl(struct inode *inode, struct file *file, > * to userspace as they are > */ > retval = vme_slave_get(image[minor].resource, > - &slave.enable, &slave.vme_addr, > - &slave.size, &pci_addr, &slave.aspace, > - &slave.cycle); > + &slave.enable, &slave.vme_addr, > + &slave.size, &pci_addr, > + &slave.aspace, &slave.cycle); > > copied = copy_to_user(argp, &slave, > - sizeof(struct vme_slave)); > + sizeof(struct vme_slave)); > if (copied != 0) { > pr_warn("Partial copy to userspace\n"); > return -EFAULT; > @@ -606,7 +607,7 @@ static int vme_user_probe(struct vme_dev *vdev) > > /* Assign major and minor numbers for the driver */ > err = register_chrdev_region(MKDEV(VME_MAJOR, 0), VME_DEVS, > - driver_name); > + driver_name); > if (err) { > dev_warn(&vdev->dev, "Error getting Major Number %d for driver.\n", > VME_MAJOR); > -- > 1.8.3.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/