mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stefan Wahren <stefan.wahren@i2se.com>
To: Rob Herring <robh+dt@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	"David S. Miller" <davem@davemloft.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Jiri Slaby <jslaby@suse.com>,
	Lino Sanfilippo <LinoSanfilippo@gmx.de>,
	Jakub Kicinski <kubakici@wp.pl>,
	devicetree@vger.kernel.org, netdev@vger.kernel.org,
	linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org,
	Stefan Wahren <stefan.wahren@i2se.com>
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	[thread overview]
Message-ID: <1495545173-22150-6-git-send-email-stefan.wahren@i2se.com> (raw)
In-Reply-To: <1495545173-22150-1-git-send-email-stefan.wahren@i2se.com>

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 <stefan.wahren@i2se.com>
---
 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 */
-- 
2.1.4

  parent reply	other threads:[~2017-05-23 13:14 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-23 13:12 [PATCH v6 net-next 00/17] net: qualcomm: add QCA7000 UART driver Stefan Wahren
2017-05-23 13:12 ` [PATCH v6 net-next 01/17] net: qualcomm: remove unnecessary includes Stefan Wahren
2017-05-24 19:41   ` David Miller
2017-05-24 20:05     ` Stefan Wahren
2017-05-24 20:42       ` David Miller
2017-05-23 13:12 ` [PATCH v6 net-next 02/17] net: qca_framing: use u16 for frame offset Stefan Wahren
2017-05-23 13:12 ` [PATCH v6 net-next 03/17] net: qca_7k: Use BIT macro Stefan Wahren
2017-05-23 13:12 ` [PATCH v6 net-next 04/17] net: qca_spi: Use SET_NETDEV_DEV() Stefan Wahren
2017-05-23 13:12 ` Stefan Wahren [this message]
2017-05-23 13:12 ` [PATCH v6 net-next 06/17] net: qualcomm: Improve readability of length defines Stefan Wahren
2017-05-23 13:12 ` [PATCH v6 net-next 07/17] net: qca_spi: remove QCASPI_MTU Stefan Wahren
2017-05-23 13:12 ` [PATCH v6 net-next 08/17] net: qualcomm: move qcaspi_tx_cmd to qca_spi.c Stefan Wahren
2017-05-23 13:12 ` [PATCH v6 net-next 09/17] net: qca_spi: Clarify MODULE_DESCRIPTION Stefan Wahren
2017-05-23 13:12 ` [PATCH v6 net-next 10/17] net: qualcomm: rename qca_framing.c to qca_7k_common.c Stefan Wahren
2017-05-23 13:12 ` [PATCH v6 net-next 11/17] net: qualcomm: prepare frame decoding for UART driver Stefan Wahren
2017-05-23 13:12 ` [PATCH v6 net-next 12/17] net: qualcomm: make qca_7k_common a separate kernel module Stefan Wahren
2017-05-23 13:12 ` [PATCH v6 net-next 13/17] dt-bindings: qca7000-spi: Rework binding Stefan Wahren
2017-05-23 13:12 ` [PATCH v6 net-next 14/17] dt-bindings: qca7000: rename binding Stefan Wahren
2017-05-23 13:12 ` [PATCH v6 net-next 15/17] dt-bindings: slave-device: add current-speed property Stefan Wahren
2017-05-23 13:12 ` [PATCH v6 net-next 16/17] dt-bindings: qca7000: append UART interface to binding Stefan Wahren
2017-05-23 13:12 ` [PATCH v6 net-next 17/17] net: qualcomm: add QCA7000 UART driver Stefan Wahren
2017-05-23 18:16   ` Lino Sanfilippo
2017-05-23 19:38     ` Stefan Wahren
2017-05-23 21:01       ` Lino Sanfilippo
2017-05-24  9:06         ` Stefan Wahren
2017-05-24  9:29           ` [PATCH v7 " Stefan Wahren
2017-05-25 17:13             ` David Miller
2017-05-24  9:32           ` [PATCH RESEND " Stefan Wahren
2017-05-24 14:21             ` Lino Sanfilippo
2017-05-24 14:34               ` Stefan Wahren
2017-05-24 14:19           ` Aw: Re: [PATCH v6 " Lino Sanfilippo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1495545173-22150-6-git-send-email-stefan.wahren@i2se.com \
    --to=stefan.wahren@i2se.com \
    --cc=LinoSanfilippo@gmx.de \
    --cc=davem@davemloft.net \
    --cc=devicetree@vger.kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=jslaby@suse.com \
    --cc=kubakici@wp.pl \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-serial@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=netdev@vger.kernel.org \
    --cc=robh+dt@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®