From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <shemming@brocade.com>
Subject: [dpdk-dev] [PATCH 5/5] igb_uio: fix checkpatch warnings
Date: Wed, 14 May 2014 09:34:06 -0700 [thread overview]
Message-ID: <20140514163512.445351102@networkplumber.org> (raw)
In-Reply-To: <20140514163401.079384157@networkplumber.org>
[-- Attachment #1: igb_uio-checkpatch.diff --]
[-- Type: text/plain, Size: 4328 bytes --]
Fix whitespace and other style issues reported by checkpatch.
Signed-off-by: Stephen Hemminger <shemming@brocade.com>
--- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c 2014-05-14 09:32:25.366870293 -0700
+++ b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c 2014-05-14 09:32:25.366870293 -0700
@@ -1,23 +1,23 @@
/*-
* GPL LICENSE SUMMARY
- *
+ *
* Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
- *
+ *
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
* The full GNU General Public License is included in this distribution
* in the file called LICENSE.GPL.
- *
+ *
* Contact Information:
* Intel Corporation
*/
@@ -32,7 +32,7 @@
#include <linux/msi.h>
#include <linux/version.h>
-#ifdef CONFIG_XEN_DOM0
+#ifdef CONFIG_XEN_DOM0
#include <xen/xen.h>
#endif
@@ -98,11 +98,11 @@ 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;
-
+
return iov->nr_virtfn;
#else
return pci_num_vf(dev);
@@ -135,13 +135,13 @@ store_max_vfs(struct device *dev, struct
else /* do nothing if change max_vfs number */
err = -EINVAL;
- return err ? err : count;
+ return err ? err : count;
}
static DEVICE_ATTR(max_vfs, S_IRUGO | S_IWUSR, show_max_vfs, store_max_vfs);
static struct attribute *dev_attrs[] = {
&dev_attr_max_vfs.attr,
- NULL,
+ NULL,
};
static const struct attribute_group dev_attr_grp = {
@@ -283,9 +283,9 @@ igbuio_dom0_pci_mmap(struct uio_info *in
{
int idx;
- if (vma->vm_pgoff >= MAX_UIO_MAPS)
+ if (vma->vm_pgoff >= MAX_UIO_MAPS)
return -EINVAL;
- if(info->mem[vma->vm_pgoff].size == 0)
+ if (info->mem[vma->vm_pgoff].size == 0)
return -EINVAL;
idx = (int)vma->vm_pgoff;
@@ -297,7 +297,7 @@ igbuio_dom0_pci_mmap(struct uio_info *in
default:
return -EINVAL;
}
-}
+}
#endif
/* Remap pci resources described by bar #pci_bar in uio resource n. */
@@ -308,8 +308,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);
@@ -333,20 +333,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 -1;
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 */
@@ -382,14 +382,18 @@ 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++;
}
}
prev parent reply other threads:[~2014-05-14 16:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-14 16:34 [dpdk-dev] [PATCH 0/5] igb_uio patches Stephen Hemminger
2014-05-14 16:34 ` [dpdk-dev] [PATCH 1/5] igb_uio: use kernel standard log message Stephen Hemminger
2014-05-14 16:34 ` [dpdk-dev] [PATCH 2/5] igb_uio: use standard uio naming Stephen Hemminger
2014-05-14 16:34 ` [dpdk-dev] [PATCH 3/5] igb_uio: mark module param read/only Stephen Hemminger
2014-05-14 16:34 ` [dpdk-dev] [PATCH 4/5] igb_uio: fix IRQ mode handling Stephen Hemminger
2014-05-22 13:50 ` Thomas Monjalon
2014-05-14 16:34 ` Stephen Hemminger [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140514163512.445351102@networkplumber.org \
--to=stephen@networkplumber.org \
--cc=dev@dpdk.org \
--cc=shemming@brocade.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).