From patchwork Fri Jan 29 14:49:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 10272 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 84B73C6F8; Fri, 29 Jan 2016 15:49:30 +0100 (CET) Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com [74.125.82.44]) by dpdk.org (Postfix) with ESMTP id 26FFBC6DE for ; Fri, 29 Jan 2016 15:49:25 +0100 (CET) Received: by mail-wm0-f44.google.com with SMTP id p63so71322273wmp.1 for ; Fri, 29 Jan 2016 06:49:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=e+CHrIA4WPK79L4KXhPsi448LDdQgvg11wk2q3qam2E=; b=Cf2X5rCvfMv9CbnljiX7qUcD8fniusWuSURanDq8CVKtXKLkQK2U7ZdsRCjSatrQ4z 3M6mmB0+kFs3Q3e4UswYLFDrqcS+o8qBgRtP5qrVmovm1EBCn24RZvNogN+iPwBRat4x amYJ/5QUX24Oo8AkxkozGU4/2mXTO9P4HcaiMe6Vd1xuQZreVpysBi2EwnWkICbJOQO4 P2nhQF7emLR6HldDR+gZpCTP2gdMQ1rBG7n8/bOmHu8epsHAmQu1VXkHFvoqcf8Ox5kR YIP3ZEtK9fidKs/O4NI6z8ahwOd13hu4QQLTEHatjtdje9erousFtrC6+ante+9anfqs o/Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=e+CHrIA4WPK79L4KXhPsi448LDdQgvg11wk2q3qam2E=; b=P724Cj2PhmL1Ez/p8x6jwjH3D+mMD6GDU7XJvnBWz0FKeNc0X1q4/envbarohjW0lM jh5HWstR/n8LI4lDQ+PyuTRBV+9Y7xJEnBWcELTMY0vxMdLVNBPAwQ+cnM29Buum90BA pPfigF21vKREseM1Fx7iEjTOsHyHxGk7eGi/LSR4f8xF03d00nJFnyrDeMy04hqhnHUq lyyUd3uZyii6mv6sEQOvVZxnd4B4Q7EUMIWACT67QUNaLnXCaUXHFKFsF12a0VpmxoyW vOy+zSgSw73EvTwCYG0l5VaycpnRCDdxEQa2q97dKmzxpPwAMg2OtOot1Frjv1/4ayDD WJ2A== X-Gm-Message-State: AG10YORYXYzxrGZBVhlt4IsDD3P24/5JNGWfh3loM8qHArLCYjigM6ygpQ43mTmpcRqwxHJT X-Received: by 10.194.246.134 with SMTP id xw6mr8921143wjc.158.1454078964037; Fri, 29 Jan 2016 06:49:24 -0800 (PST) Received: from gloops.dev.6wind.com (144.77.126.78.rev.sfr.net. [78.126.77.144]) by smtp.gmail.com with ESMTPSA id y188sm7811294wmy.11.2016.01.29.06.49.22 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 29 Jan 2016 06:49:23 -0800 (PST) From: David Marchand To: dev@dpdk.org Date: Fri, 29 Jan 2016 15:49:09 +0100 Message-Id: <1454078953-23744-6-git-send-email-david.marchand@6wind.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1454078953-23744-1-git-send-email-david.marchand@6wind.com> References: <1453476464-31767-1-git-send-email-david.marchand@6wind.com> <1454078953-23744-1-git-send-email-david.marchand@6wind.com> Cc: viktorin@rehivetech.com Subject: [dpdk-dev] [PATCH v2 5/9] pci: cosmetic change 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Indent previous commit, rename functions (internal and local functions do not need rte_eal_ prefix). Signed-off-by: David Marchand --- lib/librte_eal/common/eal_common_pci.c | 106 ++++++++++++++++----------------- 1 file changed, 52 insertions(+), 54 deletions(-) diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c index a6791c1..fd88305 100644 --- a/lib/librte_eal/common/eal_common_pci.c +++ b/lib/librte_eal/common/eal_common_pci.c @@ -206,50 +206,49 @@ pci_driver_supports_device(const struct rte_pci_driver *dr, * driver. */ static int -rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, - struct rte_pci_device *dev) +pci_probe_device(struct rte_pci_driver *dr, struct rte_pci_device *dev) { int ret; - struct rte_pci_addr *loc = &dev->addr; + struct rte_pci_addr *loc = &dev->addr; - RTE_LOG(DEBUG, EAL, "PCI device "PCI_PRI_FMT" on NUMA socket %i\n", - loc->domain, loc->bus, loc->devid, loc->function, - dev->numa_node); + RTE_LOG(DEBUG, EAL, "PCI device "PCI_PRI_FMT" on NUMA socket %i\n", + loc->domain, loc->bus, loc->devid, loc->function, + dev->numa_node); - RTE_LOG(DEBUG, EAL, " probe driver: %x:%x %s\n", dev->id.vendor_id, - dev->id.device_id, dr->name); + RTE_LOG(DEBUG, EAL, " probe driver: %x:%x %s\n", dev->id.vendor_id, + dev->id.device_id, dr->name); - /* no initialization when blacklisted, return without error */ - if (dev->devargs != NULL && - dev->devargs->type == RTE_DEVTYPE_BLACKLISTED_PCI) { - RTE_LOG(DEBUG, EAL, " Device is blacklisted, not initializing\n"); - return 1; - } + /* no initialization when blacklisted, return without error */ + if (dev->devargs != NULL && + dev->devargs->type == RTE_DEVTYPE_BLACKLISTED_PCI) { + RTE_LOG(DEBUG, EAL, " Device is blacklisted, not initializing\n"); + return 1; + } - if (dr->drv_flags & RTE_PCI_DRV_NEED_MAPPING) { + if (dr->drv_flags & RTE_PCI_DRV_NEED_MAPPING) { #ifdef RTE_PCI_CONFIG - /* - * Set PCIe config space for high performance. - * Return value can be ignored. - */ - pci_config_space_set(dev); + /* + * Set PCIe config space for high performance. + * Return value can be ignored. + */ + pci_config_space_set(dev); #endif - /* map resources for devices that use igb_uio */ - ret = pci_map_device(dev); - if (ret != 0) - return ret; - } else if (dr->drv_flags & RTE_PCI_DRV_FORCE_UNBIND && - rte_eal_process_type() == RTE_PROC_PRIMARY) { - /* unbind current driver */ - if (pci_unbind_kernel_driver(dev) < 0) - return -1; - } - - /* reference driver structure */ - dev->driver = dr; - - /* call the driver devinit() function */ - return dr->devinit(dr, dev); + /* map resources for devices that use igb_uio */ + ret = pci_map_device(dev); + if (ret != 0) + return ret; + } else if (dr->drv_flags & RTE_PCI_DRV_FORCE_UNBIND && + rte_eal_process_type() == RTE_PROC_PRIMARY) { + /* unbind current driver */ + if (pci_unbind_kernel_driver(dev) < 0) + return -1; + } + + /* reference driver structure */ + dev->driver = dr; + + /* call the driver devinit() function */ + return dr->devinit(dr, dev); } /* @@ -257,29 +256,28 @@ rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, * driver. */ static int -rte_eal_pci_detach_dev(struct rte_pci_driver *dr, - struct rte_pci_device *dev) +pci_detach_device(struct rte_pci_driver *dr, struct rte_pci_device *dev) { - struct rte_pci_addr *loc = &dev->addr; + struct rte_pci_addr *loc = &dev->addr; - RTE_LOG(DEBUG, EAL, "PCI device "PCI_PRI_FMT" on NUMA socket %i\n", - loc->domain, loc->bus, loc->devid, - loc->function, dev->numa_node); + RTE_LOG(DEBUG, EAL, "PCI device "PCI_PRI_FMT" on NUMA socket %i\n", + loc->domain, loc->bus, loc->devid, + loc->function, dev->numa_node); - RTE_LOG(DEBUG, EAL, " remove driver: %x:%x %s\n", dev->id.vendor_id, - dev->id.device_id, dr->name); + RTE_LOG(DEBUG, EAL, " remove driver: %x:%x %s\n", dev->id.vendor_id, + dev->id.device_id, dr->name); - if (dr->devuninit && (dr->devuninit(dev) < 0)) - return -1; /* negative value is an error */ + if (dr->devuninit && (dr->devuninit(dev) < 0)) + return -1; /* negative value is an error */ - /* clear driver structure */ - dev->driver = NULL; + /* clear driver structure */ + dev->driver = NULL; - if (dr->drv_flags & RTE_PCI_DRV_NEED_MAPPING) - /* unmap resources for devices that use igb_uio */ - pci_unmap_device(dev); + if (dr->drv_flags & RTE_PCI_DRV_NEED_MAPPING) + /* unmap resources for devices that use igb_uio */ + pci_unmap_device(dev); - return 0; + return 0; } /* @@ -297,7 +295,7 @@ pci_probe_all_drivers(struct rte_pci_device *dev) if (!pci_driver_supports_device(dr, dev)) continue; - rc = rte_eal_pci_probe_one_driver(dr, dev); + rc = pci_probe_device(dr, dev); if (rc < 0) /* negative value is an error */ return -1; @@ -324,7 +322,7 @@ pci_detach_all_drivers(struct rte_pci_device *dev) if (!pci_driver_supports_device(dr, dev)) continue; - rc = rte_eal_pci_detach_dev(dr, dev); + rc = pci_detach_device(dr, dev); if (rc < 0) /* negative value is an error */ return -1;