From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pd0-f174.google.com (mail-pd0-f174.google.com [209.85.192.174]) by dpdk.org (Postfix) with ESMTP id 7DFE1B362 for ; Fri, 18 Jul 2014 18:14:30 +0200 (CEST) Received: by mail-pd0-f174.google.com with SMTP id fp1so5264655pdb.19 for ; Fri, 18 Jul 2014 09:15:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:user-agent:date:from:to:cc:subject :references:mime-version:content-type:content-disposition; bh=wcBBjKio6R+DVEtG7T7zJACCtacpX/C3pMysNM/BAzc=; b=mNzqv7ANvXLn8wANProKoy0eo4CXC4tDSgW0dRTPm0xuqDEukaVIMrp7UYClxmYPTb pz/AA5zqMLrJfZy0/O2vCVYABR1HEHh5nbC6oc1RXH4dXT4l/VnwtZipYUQ7b3AV/J96 J2RvYZ5iVPla2n7HtUcw6wcPZzoE7ONiHeeZGrqp3VAhjmwUpARiC9qz/kr/4T3HBEwZ OSaXqfaazae73lITxObHyUsjx6yofWRhNFcve+1Nu0Bzg8GBwKtAr+xr5EdNnMF+nAOQ BU6idKJRuzhCjHapy4jGpvIyUUQPiV2v7PqA6JP6LhXBsq1vLKXcQ6A8HXSzNv9l3kno vsGw== X-Gm-Message-State: ALoCoQn6O3A8tRfWyxCO8fzBCa5cxI5LdfirhYUIyahx+a5BsyrBoR2hZftl5Zzt2+h5Ts+E7SHn X-Received: by 10.66.191.9 with SMTP id gu9mr6464904pac.27.1405700130245; Fri, 18 Jul 2014 09:15:30 -0700 (PDT) Received: from localhost (static-50-53-66-61.bvtn.or.frontiernet.net. [50.53.66.61]) by mx.google.com with ESMTPSA id qn13sm7990086pdb.69.2014.07.18.09.15.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jul 2014 09:15:29 -0700 (PDT) Message-Id: <20140718161532.274331752@networkplumber.org> User-Agent: quilt/0.63-1 Date: Fri, 18 Jul 2014 09:14:57 -0700 From: Stephen Hemminger To: Thomas Monjalon References: <20140718161447.020882834@networkplumber.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=igb_uio-checkpatch.patch Cc: dev@dpdk.org Subject: [dpdk-dev] [PATCH 10/10] igb_uio: fix check patch warnings X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jul 2014 16:14:31 -0000 Fix whitespace and other problems reported by checkpatch. This didi find 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 --- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c 2014-07-18 08:47:24.709604886 -0700 +++ b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c 2014-07-18 09:01:42.336616148 -0700 @@ -65,7 +65,7 @@ igbuio_get_uio_pci_dev(struct uio_info * } /* sriov sysfs */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) static int pci_num_vf(struct pci_dev *dev) struct iov { int pos; @@ -75,7 +75,7 @@ static int pci_num_vf(struct pci_dev *de u16 total; u16 initial; u16 nr_virtfn; - } *iov = (struct iov*)dev->sriov; + } *iov = (struct iov *)dev->sriov; if (!dev->is_physfn) return 0; @@ -204,9 +204,9 @@ store_max_read_request_size(struct devic 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 @@ -216,7 +216,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 = { @@ -224,7 +224,7 @@ static const struct attribute_group dev_ }; -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) /* Check if INTX works to control irq's. * Set's INTX_DISABLE flag and reads it back */ @@ -378,6 +378,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; @@ -400,8 +401,9 @@ igbuio_dom0_pci_mmap(struct uio_info *in 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) { @@ -423,8 +425,8 @@ igbuio_pci_setup_iomem(struct pci_dev *d 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); @@ -448,20 +450,20 @@ igbuio_pci_setup_ioport(struct pci_dev * { 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 */ @@ -469,6 +471,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); @@ -497,14 +500,16 @@ igbuio_setup_bars(struct pci_dev *dev, s 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++; } } @@ -513,7 +518,7 @@ igbuio_setup_bars(struct pci_dev *dev, s 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