From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f177.google.com (mail-wr0-f177.google.com [209.85.128.177]) by dpdk.org (Postfix) with ESMTP id 0320FD2D3 for ; Tue, 11 Apr 2017 17:45:28 +0200 (CEST) Received: by mail-wr0-f177.google.com with SMTP id o21so686033wrb.2 for ; Tue, 11 Apr 2017 08:45:28 -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=KYIB3Y/SkzBt1QdKPiOZkvr1pv0el2WeLEv/98o2/o8=; b=CS6s7ZNanbmVxYzICxGoJVTks3WOyO9odI20f7nm/LKJrs/SHVXT8ZnYX8SB4lyqBh Zay5f8M1ywYJkvudNfOjCa1cCwzPpS0DKYuuuUai228AfoI9ltYGt85CXXenUihY9B7B J4sw85sjp2MW8fX6IfnUHgYTEMaB9+H9yuLYWavfDbIoFfRXXrerEnHop9uFak/IIhy6 CgVxa5TQOWBp1adC5OC2PD1pViQ9kWNNaT6lh/sV49r3v/OP0ZbzTQrisdmDVfCmWXAB 5mFqSSPvX+ehH91oux/+ijVmbP/u1BWJ/n5nKBubljag7EplNi7oUoHjmfJPHOY69Tvp PXcQ== 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=KYIB3Y/SkzBt1QdKPiOZkvr1pv0el2WeLEv/98o2/o8=; b=q1atwnlNWtsENfIrC+VEhXbh1YIi6vCFq4ZJl1GFw3lrwNBWX81ZosW+8EfeFTOxrN e4VLA1YInXk2yTyGoclDzPxwNdRxSHyHeIxdqPY/iseJjLhg+XKffSWApvKodA/53W6e kjwaX/dhT7Q3mrCssl8kxRvVAMEkKQMMpsWIgPKKkVSAIZIVg91yyvGIR5QVTyaLngVB Svvb18RrTJLrRyYQ0FqH/qAx5QcRzy382XjeetMV83ixIY1bHaAAi9aTjWrUTzuN4+sw EMKVZpyEAKQpl7MrlMtl+o+j4B2UTvrA2EKFHqwG5jHxxpcVmVCNQD3NBrvVzzGlZCVm salg== X-Gm-Message-State: AN3rC/4EH70X72y3662ZcpaZCeSfLDE7SFRiEzegApfnKKwJSddcGJp+R6AihwuSqc2VQcxG X-Received: by 10.223.166.146 with SMTP id t18mr10858597wrc.15.1491925528169; Tue, 11 Apr 2017 08:45:28 -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.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 11 Apr 2017 08:45:27 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Jan Blunck Date: Tue, 11 Apr 2017 17:44:31 +0200 Message-Id: <779a489dad0fc1437bc91ba18caea8c9b101fc45.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 24/42] net/enic: 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:29 -0000 From: Jan Blunck Signed-off-by: Jan Blunck --- drivers/net/enic/enic_ethdev.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c index 2c2e29e..7579696 100644 --- a/drivers/net/enic/enic_ethdev.c +++ b/drivers/net/enic/enic_ethdev.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include "vnic_intr.h" @@ -629,17 +630,25 @@ static int eth_enicpmd_dev_init(struct rte_eth_dev *eth_dev) return enic_probe(enic); } -static struct eth_driver rte_enic_pmd = { - .pci_drv = { - .id_table = pci_id_enic_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 = eth_enicpmd_dev_init, - .dev_private_size = sizeof(struct enic), +static int eth_enic_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 enic), + eth_enicpmd_dev_init); +} + +static int eth_enic_pci_remove(struct rte_pci_device *pci_dev) +{ + return rte_eth_dev_pci_generic_remove(pci_dev, NULL); +} + +static struct rte_pci_driver rte_enic_pmd = { + .id_table = pci_id_enic_map, + .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC, + .probe = eth_enic_pci_probe, + .remove = eth_enic_pci_remove, }; -RTE_PMD_REGISTER_PCI(net_enic, rte_enic_pmd.pci_drv); +RTE_PMD_REGISTER_PCI(net_enic, rte_enic_pmd); RTE_PMD_REGISTER_PCI_TABLE(net_enic, pci_id_enic_map); RTE_PMD_REGISTER_KMOD_DEP(net_enic, "* igb_uio | uio_pci_generic | vfio"); -- 2.1.4