From patchwork Mon Mar 6 10:00:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Blunck X-Patchwork-Id: 21457 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 0FE6FFA42; Mon, 6 Mar 2017 11:02:19 +0100 (CET) Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by dpdk.org (Postfix) with ESMTP id 09AEB5A68 for ; Mon, 6 Mar 2017 11:01:18 +0100 (CET) Received: by mail-wr0-f193.google.com with SMTP id g10so21001814wrg.0 for ; Mon, 06 Mar 2017 02:01:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=UNi/J7dIIiVYQp8YgUPfuR0KnKsZNR2XNmDTaTwomR4=; b=Jzqj4AbSkz5pyqvP83w6DSceoNC4g85HERzbZpxN82n7r35gKgPxwuyVw8lrxmAg7I McfNlX62jeaMwD/7CLsNC8aTmM5XkLkQAcR1ES+xNBQNuO/Xv+GYW4ixTWjbo4cYXvop yS4n3MpNHfV4TPyGFdly5oqJBczDatGLtXloMEb7kgVLD9eVoIeKCOjF5OjfmtoHA9GA tkWJAS2aDWmR/EihIuqkriPuTlVm1tk8wbEtFu6Gd6LxBRJzkI6EPPiBcXupLRUqsfDN 89gkB4TITBWQKrkkm/0iC7bVxVLc4O7XgrfsRZLBo3JlZlmO8XxoQ9V4rrL6OrV2kn3p snOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=UNi/J7dIIiVYQp8YgUPfuR0KnKsZNR2XNmDTaTwomR4=; b=E6NlDBarFmZAyI22h8vOfNJw7s0XyFXdtU5U+3zFJYTvK3IbN1eeasTHXJ/nYLhfDh E7/B6ABjV10QOoyYYHUP9DNPFEFHiKH9wJFmt0qjbx2AgjGw/GQ3BVogtfLZ91MwNKCq R6f1rV1XUV5cbcbJgHkOq6THNPR9NVGjmr+1lvAPNEb0XgYf/RvklGgT+JbeLYoge5Qz dG3rAUfWkBdbpd1y3PAPas0vmruDiEFvCYYNhKCO4Ha+Zu1YPoMlH1f8IGgIS1liGZId +PHsTXHYZsuz1XLfRHoo/0qpvy9noF1RPNYOI5tN6+6LcZUIL7IOWSspZMorQe1Go/jK yrYA== X-Gm-Message-State: AMke39mdAvBtAHxFnSjLJ9thX0ikhI9J1cNeFghNioRWvIJdowgPPiIUjnVkRziQf9dtKw== X-Received: by 10.223.152.239 with SMTP id w102mr14481286wrb.72.1488794477586; Mon, 06 Mar 2017 02:01:17 -0800 (PST) Received: from weierstrass.local.net ([91.200.109.169]) by smtp.gmail.com with ESMTPSA id u145sm3829237wmu.1.2017.03.06.02.01.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Mar 2017 02:01:16 -0800 (PST) From: Jan Blunck To: dev@dpdk.org Date: Mon, 6 Mar 2017 11:00:20 +0100 Message-Id: <1488794430-25179-29-git-send-email-jblunck@infradead.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488794430-25179-1-git-send-email-jblunck@infradead.org> References: <1488794430-25179-1-git-send-email-jblunck@infradead.org> Subject: [dpdk-dev] [PATCH 28/38] net/mlx: Don't reference 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The eth_driver concept is unused in the mlx drivers so don't reference it. Signed-off-by: Jan Blunck --- drivers/net/mlx4/mlx4.c | 17 +++++++---------- drivers/net/mlx5/mlx5.c | 19 ++++++++----------- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index 79efaaa..31ee7e4 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -5510,7 +5510,7 @@ priv_dev_interrupt_handler_install(struct priv *priv, struct rte_eth_dev *dev) } } -static struct eth_driver mlx4_driver; +static struct rte_pci_driver mlx4_driver; /** * DPDK callback to register a PCI device. @@ -5889,16 +5889,13 @@ static const struct rte_pci_id mlx4_pci_id_map[] = { } }; -static struct eth_driver mlx4_driver = { - .pci_drv = { - .driver = { - .name = MLX4_DRIVER_NAME - }, - .id_table = mlx4_pci_id_map, - .probe = mlx4_pci_probe, - .drv_flags = RTE_PCI_DRV_INTR_LSC, +static struct rte_pci_driver mlx4_driver = { + .driver = { + .name = MLX4_DRIVER_NAME }, - .dev_private_size = sizeof(struct priv) + .id_table = mlx4_pci_id_map, + .probe = mlx4_pci_probe, + .drv_flags = RTE_PCI_DRV_INTR_LSC, }; /** diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index d4bd469..74a45f6 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -343,7 +343,7 @@ mlx5_args(struct priv *priv, struct rte_devargs *devargs) return 0; } -static struct eth_driver mlx5_driver; +static struct rte_pci_driver mlx5_driver; /** * DPDK callback to register a PCI device. @@ -373,7 +373,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) int i; (void)pci_drv; - assert(pci_drv == &mlx5_driver.pci_drv); + assert(pci_drv == &mlx5_driver); /* Get mlx5_dev[] index. */ idx = mlx5_dev_idx(&pci_dev->addr); if (idx == -1) { @@ -761,16 +761,13 @@ static const struct rte_pci_id mlx5_pci_id_map[] = { } }; -static struct eth_driver mlx5_driver = { - .pci_drv = { - .driver = { - .name = MLX5_DRIVER_NAME - }, - .id_table = mlx5_pci_id_map, - .probe = mlx5_pci_probe, - .drv_flags = RTE_PCI_DRV_INTR_LSC, +static struct rte_pci_driver mlx5_driver = { + .driver = { + .name = MLX5_DRIVER_NAME }, - .dev_private_size = sizeof(struct priv) + .id_table = mlx5_pci_id_map, + .probe = mlx5_pci_probe, + .drv_flags = RTE_PCI_DRV_INTR_LSC, }; /**