From patchwork Mon May 29 11:57:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 768149 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 3wbwHM49KWz9s0m for ; Mon, 29 May 2017 21:58:23 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751160AbdE2L5y (ORCPT ); Mon, 29 May 2017 07:57:54 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:56529 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750987AbdE2L5u (ORCPT ); Mon, 29 May 2017 07:57:50 -0400 Received: from duckbill-v2-sdk.fritz.box ([109.104.48.59]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LaHLm-1dd7S517hm-00m2zr; Mon, 29 May 2017 13:57:35 +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 v8 net-next 05/17] net: qualcomm: use net_device_ops instead of direct call Date: Mon, 29 May 2017 13:57:13 +0200 Message-Id: <1496059045-13572-6-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1496059045-13572-1-git-send-email-stefan.wahren@i2se.com> References: <1496059045-13572-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K0:XBrEB1tvt9vBTPOvAe96fwX9LX5uZjtXvF2AEIUFMN51KF0CRKi 45W7cvphR90nIeohAX8evj4wQIp81yDHOPhhKOP0NS8IbzAC1nBCDzG+NToCB7wmh+sWfG4 dCAlhaTjao2QFQOqlKglDCt+PsSvSrF9GEXYdKbMA3niFUeI2uP5i/BlQ1WV897vgcrWvn8 GNY1FISvwaD3CR4fIeOBA== X-UI-Out-Filterresults: notjunk:1; V01:K0:M8cNnGcur3U=:pffjKI3TbBGbcGRXc5VDTz pp4EBoXLtQT8GV2TSraJPMzk7ZesVN82WAQbLf1cGNPYKy0uk0W68TkVDU4W8+qijKZJj3IOL 5MfeBCXWE9fIMh8ueeZFxR3jE8blPMw0ANOsdmJcoKMqpQSysJ5xgkemf46omzS1QJlDjnIAm BWbngWjaVBUE8peIvUBkvO2w2t9HrDuFVB+jSez2nFRRZ3K04mmuFjrFjUuDxvYGq1mW6/8BP zbnfb2xrViQkPqMYsnSNC84ARYpuLGBi/ymeTHuXj6iffa70nICxxxYEtce+3XTiPQiopVosf 1FV07XHFI8ASULq0Nv3uTwPHyP4wY865UxdEd9eY7ziwaRvSRlAk8c0RU9/iaepzc2i5mA3UT gh06vAmexM3r/vO0iEQb1c6FqVCJO8hs1h4QUe6AHbNcp1fCu48flMnDe3qMYHcwIKIPaGVSq bVHN1xxhDjciNAcs99dMn3a6MZMrStCLYp6l2afKjJjeN2DeORpKMT6jD80aV3oHnmO0dd0N/ CjJwuocU3AwpBnot8PUxoGQTRQq7XW8HzNbQpuW2NCqOz202/qcfrIp1tFYXF7fxQXL8tRuxh WmoKfgx97gh67LVuuYNF/dRyufD+oKDs25oBpgq+0RahC+q3oaqFj/H97hpaFD/nXAkBpARrN Gw/Zke9FU9gFH7hBwb4+b6PsCemaCiSSqjtrUplvPPN5vNtA3IGUL9kaXdEFYQJWxZjw= 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 */