From 5635ae04abc3c3243b977a2d0027ca098e82ed97 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 6 Jun 2014 16:50:31 -0700 Subject: [PATCH] igb_uio: fix checkpatch warnings Fix style issues reported by checkpatch. There was a real bug in that the setup code was returning positive value for errors which goes against convention and might have caused a problem. Signed-off-by: Stephen Hemminger Acked-by: Thomas Monjalon --- lib/librte_eal/linuxapp/igb_uio/igb_uio.c | 49 +++++++++++++---------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c index 55049b2bb8..69ff58c21a 100644 --- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c +++ b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c @@ -85,7 +85,7 @@ igbuio_get_uio_pci_dev(struct uio_info *info) /* sriov sysfs */ int local_pci_num_vf(struct pci_dev *dev) { -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) struct iov { int pos; int nres; @@ -94,7 +94,7 @@ int local_pci_num_vf(struct pci_dev *dev) u16 total; u16 initial; u16 nr_virtfn; - } *iov = (struct iov*)dev->sriov; + } *iov = (struct iov *)dev->sriov; if (!dev->is_physfn) return 0; @@ -221,9 +221,9 @@ store_max_read_request_size(struct device *dev, static DEVICE_ATTR(max_vfs, S_IRUGO | S_IWUSR, show_max_vfs, store_max_vfs); #ifdef RTE_PCI_CONFIG -static DEVICE_ATTR(extended_tag, S_IRUGO | S_IWUSR, show_extended_tag, \ +static DEVICE_ATTR(extended_tag, S_IRUGO | S_IWUSR, show_extended_tag, store_extended_tag); -static DEVICE_ATTR(max_read_request_size, S_IRUGO | S_IWUSR, \ +static DEVICE_ATTR(max_read_request_size, S_IRUGO | S_IWUSR, show_max_read_request_size, store_max_read_request_size); #endif @@ -233,7 +233,7 @@ static struct attribute *dev_attrs[] = { &dev_attr_extended_tag.attr, &dev_attr_max_read_request_size.attr, #endif - NULL, + NULL, }; static const struct attribute_group dev_attr_grp = { @@ -244,7 +244,7 @@ static inline int pci_lock(struct pci_dev * pdev) { /* Some function names changes between 3.2.0 and 3.3.0... */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) pci_block_user_cfg_access(pdev); return 1; #else @@ -256,7 +256,7 @@ static inline void pci_unlock(struct pci_dev * pdev) { /* Some function names changes between 3.2.0 and 3.3.0... */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) pci_unblock_user_cfg_access(pdev); #else pci_cfg_access_unlock(pdev); @@ -406,6 +406,7 @@ static int igbuio_dom0_mmap_phys(struct uio_info *info, struct vm_area_struct *vma) { int idx; + idx = (int)vma->vm_pgoff; vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); vma->vm_page_prot.pgprot |= _PAGE_IOMAP; @@ -428,8 +429,9 @@ igbuio_dom0_pci_mmap(struct uio_info *info, struct vm_area_struct *vma) if (vma->vm_pgoff >= MAX_UIO_MAPS) return -EINVAL; - if(info->mem[vma->vm_pgoff].size == 0) - return -EINVAL; + + if (info->mem[vma->vm_pgoff].size == 0) + return -EINVAL; idx = (int)vma->vm_pgoff; switch (info->mem[idx].memtype) { @@ -451,8 +453,8 @@ igbuio_pci_setup_iomem(struct pci_dev *dev, struct uio_info *info, unsigned long addr, len; void *internal_addr; - if (sizeof(info->mem) / sizeof (info->mem[0]) <= n) - return (EINVAL); + if (sizeof(info->mem) / sizeof(info->mem[0]) <= n) + return -EINVAL; addr = pci_resource_start(dev, pci_bar); len = pci_resource_len(dev, pci_bar); @@ -476,20 +478,20 @@ igbuio_pci_setup_ioport(struct pci_dev *dev, struct uio_info *info, { unsigned long addr, len; - if (sizeof(info->port) / sizeof (info->port[0]) <= n) - return (EINVAL); + if (sizeof(info->port) / sizeof(info->port[0]) <= n) + return -EINVAL; addr = pci_resource_start(dev, pci_bar); len = pci_resource_len(dev, pci_bar); if (addr == 0 || len == 0) - return (-1); + return -EINVAL; info->port[n].name = name; info->port[n].start = addr; info->port[n].size = len; info->port[n].porttype = UIO_PORT_X86; - return (0); + return 0; } /* Unmap previously ioremap'd resources */ @@ -497,6 +499,7 @@ static void igbuio_pci_release_iomem(struct uio_info *info) { int i; + for (i = 0; i < MAX_UIO_MAPS; i++) { if (info->mem[i].internal_addr) iounmap(info->mem[i].internal_addr); @@ -525,14 +528,16 @@ igbuio_setup_bars(struct pci_dev *dev, struct uio_info *info) pci_resource_start(dev, i) != 0) { flags = pci_resource_flags(dev, i); if (flags & IORESOURCE_MEM) { - if ((ret = igbuio_pci_setup_iomem(dev, info, - iom, i, bar_names[i])) != 0) - return (ret); + ret = igbuio_pci_setup_iomem(dev, info, iom, + i, bar_names[i]); + if (ret != 0) + return ret; iom++; } else if (flags & IORESOURCE_IO) { - if ((ret = igbuio_pci_setup_ioport(dev, info, - iop, i, bar_names[i])) != 0) - return (ret); + ret = igbuio_pci_setup_ioport(dev, info, iop, + i, bar_names[i]); + if (ret != 0) + return ret; iop++; } } @@ -541,7 +546,7 @@ igbuio_setup_bars(struct pci_dev *dev, struct uio_info *info) return ((iom != 0) ? ret : ENOENT); } -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) static int __devinit #else static int -- 2.20.1