From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pd0-f172.google.com (mail-pd0-f172.google.com [209.85.192.172]) by dpdk.org (Postfix) with ESMTP id 8952E6848 for ; Sat, 7 Jun 2014 01:50:53 +0200 (CEST) Received: by mail-pd0-f172.google.com with SMTP id fp1so3024371pdb.17 for ; Fri, 06 Jun 2014 16:51:06 -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=3SFFDJUvZqrzGZxUGINHqnLbJbzwGDPHPPM0qQRDorI=; b=E6FlHPnNLUA4p/mrN8FpQk5yyDeaEmnSb3/d5GzZmvWDAq7wuY4Ft8PiW1DRKzie2F Vc1xfxHglGxg5nOBtKjg5Is8ItJxXHTDWn46yuup/ROLviH6FVTpr3Hbd8yvOWgBuOw7 1i8FLB1hJlrDfd5Sk5puWzH+YFVYzo4jsF7fiVpKvSk+RAIw3XihCQQQ67CAZD1aVYHI PP8iUhiRNCBpUJPecQ0nHHDiuQIyeostUUSxbJgcazWqaCnb+zv2Gb2NrRpfeTmaRHro aG43F9m9ksS+aZGd5FFfsK5CtBkj4ZfRs/lyu27QLtaeUyhh6PQSOccS9mWsR1s7kTon 7Qqw== X-Gm-Message-State: ALoCoQk5rn4jXD3VFqchbcGMcl9M7hNhOabsTwgGOpzCYV9B6Q6oPRYAUHI6ElFk8Xpa4ajw16Nv X-Received: by 10.68.253.73 with SMTP id zy9mr5908431pbc.114.1402098666864; Fri, 06 Jun 2014 16:51:06 -0700 (PDT) Received: from localhost (static-50-53-83-51.bvtn.or.frontiernet.net. [50.53.83.51]) by mx.google.com with ESMTPSA id it4sm40895500pbc.39.2014.06.06.16.51.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Jun 2014 16:51:06 -0700 (PDT) Message-Id: <20140606235105.260111910@networkplumber.org> User-Agent: quilt/0.63-1 Date: Fri, 06 Jun 2014 16:50:31 -0700 From: Stephen Hemminger To: Alan Carew References: <20140606235028.189345212@networkplumber.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=igb_uio-checkpatch.diff Cc: dev@dpdk.org Subject: [dpdk-dev] [PATCH v2 03/10] igb_uio: fix checkpatch 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, 06 Jun 2014 23:50:54 -0000 Fix whitespace and other style issues reported by checkpatch. Signed-off-by: Stephen Hemminger --- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c +++ b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c @@ -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 #include -#ifdef CONFIG_XEN_DOM0 +#ifdef CONFIG_XEN_DOM0 #include #endif @@ -71,7 +71,7 @@ msix_entries[IGBUIO_NUM_MSI_VECTORS]; /* pointer to the msix vectors to be allocated later */ }; -static char *intr_mode = NULL; +static char *intr_mode; static enum igbuio_intr_mode igbuio_intr_mode_preferred = IGBUIO_MSIX_INTR_MODE; /* PCI device id table */ @@ -109,11 +109,11 @@ 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); @@ -146,13 +146,13 @@ 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 = { @@ -338,7 +338,7 @@ } /** - * This is uio device mmap method which will use igbuio mmap for Xen + * This is uio device mmap method which will use igbuio mmap for Xen * Dom0 enviroment. */ static int @@ -346,9 +346,9 @@ { 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; @@ -360,7 +360,7 @@ default: return -EINVAL; } -} +} #endif /* Remap pci resources described by bar #pci_bar in uio resource n. */ @@ -371,8 +371,8 @@ 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); @@ -396,20 +396,20 @@ { 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 */ @@ -445,14 +445,18 @@ 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++; } }