From patchwork Wed May 10 08:53:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 760506 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 3wN9HN3LHvz9s2P for ; Wed, 10 May 2017 19:02:40 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752636AbdEJIxu (ORCPT ); Wed, 10 May 2017 04:53:50 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:58503 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752046AbdEJIxq (ORCPT ); Wed, 10 May 2017 04:53:46 -0400 Received: from duckbill-v2-sdk.fritz.box ([109.104.47.221]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.183]) with ESMTPSA (Nemesis) id 0LgHVU-1dmwvu1kvs-00ngv6; Wed, 10 May 2017 10:53:30 +0200 From: Stefan Wahren To: Rob Herring , "David S. Miller" Cc: Mark Rutland , Greg Kroah-Hartman , Jiri Slaby , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, Stefan Wahren Subject: [PATCH v5 04/17] net: qualcomm: use net_device_ops instead of direct call Date: Wed, 10 May 2017 10:53:15 +0200 Message-Id: <1494406408-31760-5-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1494406408-31760-1-git-send-email-stefan.wahren@i2se.com> References: <1494406408-31760-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K0:+CqyNHArduMnMSsH8OB1P25QkPU6mOOgPIggEfa/PtsaJyU+RUQ oog7+o+Ri4787XjEVtgG40xAbUHSv+70MK+VVVqdqhdnn18PagfhjrCTNMS8YwyeYVU3qHh 2H+p1Y2AG0ndXxeRX9CpWz9ELqUineN8Bed0AC8X73uWMx7j1Vt07y/kosOc3sGe6VpkD1t zFzTd3W7CGvvAl0GMTyIA== X-UI-Out-Filterresults: notjunk:1; V01:K0:4KKsrF5zsSY=:ovnJOpxwwe3uJJt5WAvWbJ nCoeEOhHhLFBHxElFM8NAaGvNtkEtRe00CMydp5ZKty/0JCVn5HkcY9H/u90+dGh70tmFH/N9 a+vdcy3l6ri6ofJci0/Mb9+ZK5a8BYBPJGXH1J/+FcYEU0Kz/rwpRzRUrfZp1LhWNeYTU3CYh SlGW6KKa+a+ipw7Swxv/KiIbaPw150TwS2cI+njifNA/dCai1GiiTcm0fQQtwKjMIfl3VCcJH mmplnucNbGj22t+zAVzin5+FhEme5MPpMwVnqkGGQ2gTgtKZ2e/dDkJ4jQMVMVCrfltbfGBWO cv17kOgOwZ9BV0ItwU3jP9eC9tazyHOowyunYSVjtHrHpi+Wkj5RTF73yIzJx4fN5CmO8eoAm jM2/qbzw+Tf6gVsNYevBbygpfNRgKaHCLeNz4OrIa1z78vRhIea7WPkVDsHHNJ7VVdqss/0h2 JObLs8gDC/bliBsAB/cUflfhYIkK3RL2In3OqMacDxUDLNjc7X5ki4xNHY1hfeq8yaDWP2S5n a830BidtWnRFxQWeLUJaTx+IA6QQVlQS7FXXb+kDOXijFNxTl5xJ9tpyjfXqgfSL7cTBmYjVg 91mQLOVQpZzf95Pm9BibPhKbdE8300WTgPKiS7TNVPnZkSZfYuK+QPJCSHcwQ8IszwHe4xu1t ILqyEepjaothWRlgfZgsoEMkx5Esk/vUZf7o1uJlWF+dd+H+vrVdaUC4fzdTm4dXDvX0= 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 8590109..5c79612 100644 --- a/drivers/net/ethernet/qualcomm/qca_spi.c +++ b/drivers/net/ethernet/qualcomm/qca_spi.c @@ -602,7 +602,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); @@ -639,7 +639,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 */