From patchwork Tue May 23 13:12:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 765955 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wXGJ86PQHz9sPJ for ; Tue, 23 May 2017 23:16:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967533AbdEWNOu (ORCPT ); Tue, 23 May 2017 09:14:50 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:60024 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967520AbdEWNOp (ORCPT ); Tue, 23 May 2017 09:14:45 -0400 Received: from duckbill-v2-sdk.fritz.box ([109.104.44.37]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MbQQe-1dTiXK0EGi-00IlfQ; Tue, 23 May 2017 15:13:18 +0200 From: Stefan Wahren To: Rob Herring , Mark Rutland , "David S. Miller" Cc: Greg Kroah-Hartman , Jiri Slaby , Lino Sanfilippo , Jakub Kicinski , devicetree@vger.kernel.org, netdev@vger.kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Wahren Subject: [PATCH v6 net-next 05/17] net: qualcomm: use net_device_ops instead of direct call Date: Tue, 23 May 2017 15:12:41 +0200 Message-Id: <1495545173-22150-6-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1495545173-22150-1-git-send-email-stefan.wahren@i2se.com> References: <1495545173-22150-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K0:gBmqJUYPgPKii7iMYa6g8D0HdzoMblEIGwu40BEqNUDEDoKJb5x etAbwucKSjBwF5fHLwCVg/7GkbZr25+0KqD1aLUp3+oLaY3zpqYuPWN2HqulCC6wEwY0Ia5 3hWtcrCjRxFO5JRvLKRMe41MCTtXtrCQKInmA0iXTSCVulMDYCGJ/UzF+7uq6lJ+mSzu/SI dKQ4gFAJrOPPIqsfXkmCw== X-UI-Out-Filterresults: notjunk:1; V01:K0:Rrv5+l5lGE4=:+RIpeVwP7EMJ8Bdtheryl6 7P6adb7ktXEi3bcCFm+oVb9IbbJ6ibLNx8809IY0PBS1Q1A3DyR2n2zQg1XUHTBgoyyiky22g /tNEdYolVmJDyG4jhrPAXNsBdFE53skXP4VutoSETKn5Dlh3Qjx4qiZSyZvFB3IwaBrdZG7qM Th/cN4IzEc8b0RfVtDHmjagDE9KcLEc5X3lZeW1GH1INLyAozrQQQBkjcrvhxm1xUOWv+LIgd nQStx6i/tzWx76bsrBpgatBkbCKTz8UQpy2EF8yRw1P/3iYTCsoNxyejv0SoVBo77ja9pa0OY lFzz0Qwa7Vorwn8bMGrUVTcfLLwkx96h4aa9Iq1Fpj35OO6g7f+g2Ckz51mSbNuFmm/Aza5x2 sbaQia23gDGZyzr5MuUHUgUR65xngKCZaxDHQcQAQ6uZaScV6rVtkJfHQ8fke++7z5+3SZJ6u 2u9iFeZU/XDP+CacMJlqkf1nNOqzos3/RvogiyWzcVtvgjQVpDWrW3w8o4FhTwFGPhCw2uTCc c1fj9qZkvi4Za4w5iEsDDVkZYMxs1PymfmvJ0mzVoNUgEodpZ+EUe+HZ/R6MVRU7qQg03nH4L 6T7/JrEfwRqdeAEEXTz8VKYQbQEEpcCx+l5VMI2fGtQYy49q9+3mu27DAG0qVpCSShz5ebPAv S7d1gXniQjA6MYFw/VqS1D9gugfyE/dmB3mUPLqbWngTXASQsbCjEoyfaHGQafYTAObo= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There is no need to export qcaspi_netdev_open and qcaspi_netdev_close because they are also accessible via the net_device_ops. Signed-off-by: Stefan Wahren --- drivers/net/ethernet/qualcomm/qca_debug.c | 5 +++-- drivers/net/ethernet/qualcomm/qca_spi.c | 4 ++-- drivers/net/ethernet/qualcomm/qca_spi.h | 3 --- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/qualcomm/qca_debug.c b/drivers/net/ethernet/qualcomm/qca_debug.c index d145df9..92b6be9 100644 --- a/drivers/net/ethernet/qualcomm/qca_debug.c +++ b/drivers/net/ethernet/qualcomm/qca_debug.c @@ -275,6 +275,7 @@ qcaspi_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ring) static int qcaspi_set_ringparam(struct net_device *dev, struct ethtool_ringparam *ring) { + const struct net_device_ops *ops = dev->netdev_ops; struct qcaspi *qca = netdev_priv(dev); if ((ring->rx_pending) || @@ -283,13 +284,13 @@ qcaspi_set_ringparam(struct net_device *dev, struct ethtool_ringparam *ring) return -EINVAL; if (netif_running(dev)) - qcaspi_netdev_close(dev); + ops->ndo_stop(dev); qca->txr.count = max_t(u32, ring->tx_pending, TX_RING_MIN_LEN); qca->txr.count = min_t(u16, qca->txr.count, TX_RING_MAX_LEN); if (netif_running(dev)) - qcaspi_netdev_open(dev); + ops->ndo_open(dev); return 0; } diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c index 0c3fdee..7e039e3 100644 --- a/drivers/net/ethernet/qualcomm/qca_spi.c +++ b/drivers/net/ethernet/qualcomm/qca_spi.c @@ -603,7 +603,7 @@ qcaspi_intr_handler(int irq, void *data) return IRQ_HANDLED; } -int +static int qcaspi_netdev_open(struct net_device *dev) { struct qcaspi *qca = netdev_priv(dev); @@ -640,7 +640,7 @@ qcaspi_netdev_open(struct net_device *dev) return 0; } -int +static int qcaspi_netdev_close(struct net_device *dev) { struct qcaspi *qca = netdev_priv(dev); diff --git a/drivers/net/ethernet/qualcomm/qca_spi.h b/drivers/net/ethernet/qualcomm/qca_spi.h index 6e31a0e..064853d 100644 --- a/drivers/net/ethernet/qualcomm/qca_spi.h +++ b/drivers/net/ethernet/qualcomm/qca_spi.h @@ -108,7 +108,4 @@ struct qcaspi { u16 burst_len; }; -int qcaspi_netdev_open(struct net_device *dev); -int qcaspi_netdev_close(struct net_device *dev); - #endif /* _QCA_SPI_H */