From patchwork Tue Jul 11 23:25:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ga=C3=ABtan_Rivet?= X-Patchwork-Id: 26844 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 EEEAC7D04; Wed, 12 Jul 2017 01:26:26 +0200 (CEST) Received: from mail-wr0-f171.google.com (mail-wr0-f171.google.com [209.85.128.171]) by dpdk.org (Postfix) with ESMTP id D45D17CE5 for ; Wed, 12 Jul 2017 01:26:07 +0200 (CEST) Received: by mail-wr0-f171.google.com with SMTP id r103so9928735wrb.0 for ; Tue, 11 Jul 2017 16:26:07 -0700 (PDT) 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 :in-reply-to:references; bh=pMbkiWbVDt5iYXGb7Nxm525IwGssoWuZKzgMEDC2xZ4=; b=hTPPfmrbysyVDE9TiuACRJ2Xa7m3z5Afq1owQh7EJOgLkMyDN5BQfBVY3BKfHZtbdk 2v+PbfghYsvWZPfIIGqB2LZdKyky5WBq/iloClgTTGXJVRxjIDAKtETNqR4jgfjDpMsy 8XX0zfmqlJDXqtlNKACLoF510OKEr37VQlFYLcMKNzMDZK3Y0CE+rQbkOCV9QOhdoNrR wKFHxccJn9ltUxMohxUOMvAGO6fV5e5lIjE52wFbu8angq2HfI+UWUmAt7SRdh5HGS0H H3p4AW7UMF06SUr4WJbfZNv1dhG7RW5FUwUccyiRQpsmvFk9NVodPbjSjcafG5npQE9d B5sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=pMbkiWbVDt5iYXGb7Nxm525IwGssoWuZKzgMEDC2xZ4=; b=ahcf+KRQCvCotwxzqH5RtDPGeuUp2marh60/33T/UGzlcy0c4V6jBUoqq0mFzkjYBk GCAkwsTZc6G+N4ug1UauDHoTKuQWcNNRzGQ8klw7PmDYJNKiHaan0lY8oZ2v6N1UPFAc pIA4IS5eZR2RR+n/xGxaHf9iQ8TagvKdrlr7cRkq2ngRjFS1ibmON8HsZjPyV/8JFQJW 72wMA31GrXVTiYomc1H4lVcqeWA1Sn/pURh2GGUFz8hj/xpZxEdAbEqO7DkcQocK6ty4 8Nk1sB40gruXF7mZ9KGu90R3Yrha2caET/21mQnQJOCh9i16+KD/Ad/LdyTPHQ9SUyCJ ptgw== X-Gm-Message-State: AIVw112ussEwzRXZoyYFkneztBLn3VFtxHEd4f0tMARTmb9yneoLVrvs M8blefuQi5qQifQi7Jo= X-Received: by 10.28.229.207 with SMTP id c198mr430777wmh.108.1499815567027; Tue, 11 Jul 2017 16:26:07 -0700 (PDT) Received: from bidouze.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id 66sm407576wmj.29.2017.07.11.16.26.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 11 Jul 2017 16:26:06 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Wed, 12 Jul 2017 01:25:42 +0200 Message-Id: <7142c59ea7d5dc6ffe5f269da355556f243d660c.1499814957.git.gaetan.rivet@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v3 8/8] bus: remove useless plug parameter X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The prior scan should link the relevant rte_devargs to the newly allocated rte_device. As such, it is useless to pass device arguments to the plug callback. Those arguments are available within the devargs field of the rte_device structure. Fixes: 7c8810f43f6e ("bus: introduce device plug/unplug") Fixes: 00e62aae69c0 ("bus/pci: implement plug/unplug operations") Fixes: a3ee360f4440 ("eal: add hotplug add/remove device") Signed-off-by: Gaetan Rivet --- lib/librte_eal/common/eal_common_dev.c | 2 +- lib/librte_eal/common/eal_common_pci.c | 2 +- lib/librte_eal/common/eal_common_vdev.c | 2 +- lib/librte_eal/common/include/rte_bus.h | 6 +----- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/common/eal_common_dev.c index f5566a6..6fcbea4 100644 --- a/lib/librte_eal/common/eal_common_dev.c +++ b/lib/librte_eal/common/eal_common_dev.c @@ -188,7 +188,7 @@ int rte_eal_hotplug_add(const char *busname, const char *devname, goto err_devarg; } - ret = bus->plug(dev, devargs); + ret = bus->plug(dev); if (ret) { RTE_LOG(ERR, EAL, "Driver cannot attach the device (%s)\n", dev->name); diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c index cdd197a..9ad1bf1 100644 --- a/lib/librte_eal/common/eal_common_pci.c +++ b/lib/librte_eal/common/eal_common_pci.c @@ -541,7 +541,7 @@ pci_find_device(const struct rte_device *start, rte_dev_cmp_t cmp, } static int -pci_plug(struct rte_device *dev, const char *devargs __rte_unused) +pci_plug(struct rte_device *dev) { return pci_probe_all_drivers(RTE_DEV_TO_PCI(dev)); } diff --git a/lib/librte_eal/common/eal_common_vdev.c b/lib/librte_eal/common/eal_common_vdev.c index 79bb795..0817573 100644 --- a/lib/librte_eal/common/eal_common_vdev.c +++ b/lib/librte_eal/common/eal_common_vdev.c @@ -316,7 +316,7 @@ vdev_find_device(const struct rte_device *start, rte_dev_cmp_t cmp, } static int -vdev_plug(struct rte_device *dev, const char *args __rte_unused) +vdev_plug(struct rte_device *dev) { return vdev_probe_all_drivers(RTE_DEV_TO_VDEV(dev)); } diff --git a/lib/librte_eal/common/include/rte_bus.h b/lib/librte_eal/common/include/rte_bus.h index af9f0e1..c79368d 100644 --- a/lib/librte_eal/common/include/rte_bus.h +++ b/lib/librte_eal/common/include/rte_bus.h @@ -113,15 +113,11 @@ typedef struct rte_device * * @param dev * Device pointer that was returned by a previous call to find_device. * - * @param devargs - * Device declaration. - * * @return * 0 on success. * !0 on error. */ -typedef int (*rte_bus_plug_t)(struct rte_device *dev, - const char *devargs); +typedef int (*rte_bus_plug_t)(struct rte_device *dev); /** * Implementation specific remove function which is responsible for unlinking