From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f176.google.com (mail-wr0-f176.google.com [209.85.128.176]) by dpdk.org (Postfix) with ESMTP id D46CED278 for ; Tue, 11 Apr 2017 17:45:23 +0200 (CEST) Received: by mail-wr0-f176.google.com with SMTP id l28so752725wre.0 for ; Tue, 11 Apr 2017 08:45:23 -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=pq2fuNwHkM8n4AyLfPT3iDfCJPdoRqRzNmKvr/9cmGg=; b=L869dSIOiUCl7qqXz1GmToexbs0A92OTSy5ZjMziaZSwv7kURl/9jHN21roXfEAPGX pb2gjMX3ack4mlqJvNYJvcsyyX5qmzFuvJJwsKp21ppX9c+lBdRo8YOUJtXQ2SOqbXvz KwQ9szKfnGtTZl3LniIZOZaDN8ePyQ1JyFgULgSAlfnaxtQFNIRHqf/jcKHlxI4xUkRI V4v52TejZ0YFxIWIIixTYypJO6PfRmBgb46MKwzyd+8wouhuNm9PjK50vEo7bVrciN6k 6HkJki2FQkJ/5rSpP7mr5l1ngXW95zQLLBPjzOcA5axPl5/QWSpioUEa3ji9PoFtmLEP 1e9w== 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=pq2fuNwHkM8n4AyLfPT3iDfCJPdoRqRzNmKvr/9cmGg=; b=gnFYCrt3mCBEw5QuF/YEx3lLmsReh5Rp88ODUd5ngPPRwhjmiHcCAwZ1K0KfmgJX4K Kg2pdnyVcgK0b/YCoqzCpM7T2NOJVX9uh22lh9dcRRndo1rjWP6uwd8PgU179kWxcag6 DsV7xfhFSv8zhWJQQejdGqKNMgQx3fmcIRCoTpKy6BF9EtCWmq/8OMu4nQX+xWK2ZWjw ZHu/l8F0+feL2/2dnfYPbwObR1CzvuWAnFkM2LsjgSPwr5mWMoie8/HoaupeTxBrFf59 S9MjYu3wwNytWq59sREjT1EZkbWLVGQmZwV6IGTQuO3pMkarzhsk3KMKnZuViCjncBMj PThA== X-Gm-Message-State: AFeK/H05z0tgraYFg0Ea+XJNwIUFD9h5MB0R4hgknWeImeknICftPOhLWJIIZsvHDW/Padgj X-Received: by 10.223.176.242 with SMTP id j47mr33937910wra.81.1491925523341; Tue, 11 Apr 2017 08:45:23 -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 u63sm2933738wmu.22.2017.04.11.08.45.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 11 Apr 2017 08:45:22 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Jan Blunck Date: Tue, 11 Apr 2017 17:44:26 +0200 Message-Id: <0d6b75f59c73b0dec32eb7282b181ecc76b9c51e.1491924900.git.gaetan.rivet@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: <1488794430-25179-1-git-send-email-jblunck@infradead.org> In-Reply-To: References: Subject: [dpdk-dev] [PATCH v2 19/42] net/bnxt: Don't use eth_driver 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: , X-List-Received-Date: Tue, 11 Apr 2017 15:45:24 -0000 From: Jan Blunck Signed-off-by: Jan Blunck --- drivers/net/bnxt/bnxt_ethdev.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 6167443..5dc3ff0 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -36,6 +36,7 @@ #include #include +#include #include #include @@ -1075,6 +1076,8 @@ static int bnxt_init_board(struct rte_eth_dev *eth_dev) return rc; } +static int bnxt_dev_uninit(struct rte_eth_dev *eth_dev); + static int bnxt_dev_init(struct rte_eth_dev *eth_dev) { @@ -1167,7 +1170,7 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev) return 0; error_free: - eth_dev->driver->eth_dev_uninit(eth_dev); + bnxt_dev_uninit(eth_dev); error: return rc; } @@ -1196,19 +1199,26 @@ bnxt_dev_uninit(struct rte_eth_dev *eth_dev) { return rc; } -static struct eth_driver bnxt_rte_pmd = { - .pci_drv = { - .id_table = bnxt_pci_id_map, - .drv_flags = RTE_PCI_DRV_NEED_MAPPING | - RTE_PCI_DRV_INTR_LSC, - .probe = rte_eth_dev_pci_probe, - .remove = rte_eth_dev_pci_remove - }, - .eth_dev_init = bnxt_dev_init, - .eth_dev_uninit = bnxt_dev_uninit, - .dev_private_size = sizeof(struct bnxt), +static int bnxt_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, + struct rte_pci_device *pci_dev) +{ + return rte_eth_dev_pci_generic_probe(pci_dev, sizeof(struct bnxt), + bnxt_dev_init); +} + +static int bnxt_pci_remove(struct rte_pci_device *pci_dev) +{ + return rte_eth_dev_pci_generic_remove(pci_dev, bnxt_dev_uninit); +} + +static struct rte_pci_driver bnxt_rte_pmd = { + .id_table = bnxt_pci_id_map, + .drv_flags = RTE_PCI_DRV_NEED_MAPPING | + RTE_PCI_DRV_INTR_LSC, + .probe = bnxt_pci_probe, + .remove = bnxt_pci_remove, }; -RTE_PMD_REGISTER_PCI(net_bnxt, bnxt_rte_pmd.pci_drv); +RTE_PMD_REGISTER_PCI(net_bnxt, bnxt_rte_pmd); RTE_PMD_REGISTER_PCI_TABLE(net_bnxt, bnxt_pci_id_map); RTE_PMD_REGISTER_KMOD_DEP(net_bnxt, "* igb_uio | uio_pci_generic | vfio"); -- 2.1.4