From: Marek Vasut <marex@denx.de>
To: netdev@vger.kernel.org
Cc: Marek Vasut <marex@denx.de>,
"David S . Miller" <davem@davemloft.net>,
Lukas Wunner <lukas@wunner.de>, Petr Stetiar <ynezz@true.cz>,
YueHaibing <yuehaibing@huawei.com>
Subject: [PATCH 10/14] net: ks8851: Split out SPI specific code from probe() and remove()
Date: Tue, 24 Mar 2020 00:42:59 +0100 [thread overview]
Message-ID: <20200323234303.526748-11-marex@denx.de> (raw)
In-Reply-To: <20200323234303.526748-1-marex@denx.de>
Factor out common code into ks8851_probe_common() and
ks8851_remove_common() to permit both SPI and parallel
bus driver variants to use the common code path for
both probing and removal.
There should be no functional change.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Lukas Wunner <lukas@wunner.de>
Cc: Petr Stetiar <ynezz@true.cz>
Cc: YueHaibing <yuehaibing@huawei.com>
---
drivers/net/ethernet/micrel/ks8851.c | 69 ++++++++++++++++------------
1 file changed, 40 insertions(+), 29 deletions(-)
diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c
index 56f505ae6458..608c8fe4b5e8 100644
--- a/drivers/net/ethernet/micrel/ks8851.c
+++ b/drivers/net/ethernet/micrel/ks8851.c
@@ -1371,27 +1371,14 @@ static int ks8851_resume(struct device *dev)
static SIMPLE_DEV_PM_OPS(ks8851_pm_ops, ks8851_suspend, ks8851_resume);
-static int ks8851_probe(struct spi_device *spi)
+static int ks8851_probe_common(struct net_device *ndev, struct device *dev)
{
- struct device *dev = &spi->dev;
- struct ks8851_net_spi *kss;
- struct net_device *ndev;
- struct ks8851_net *ks;
- int ret;
+ struct ks8851_net *ks = netdev_priv(ndev);
unsigned cider;
int gpio;
-
- ndev = devm_alloc_etherdev(dev, sizeof(struct ks8851_net_spi));
- if (!ndev)
- return -ENOMEM;
-
- spi->bits_per_word = 8;
-
- ks = netdev_priv(ndev);
- kss = to_ks8851_spi(ks);
+ int ret;
ks->netdev = ndev;
- kss->spidev = spi;
ks->tx_space = 6144;
gpio = of_get_named_gpio_flags(dev->of_node, "reset-gpios",
@@ -1446,17 +1433,7 @@ static int ks8851_probe(struct spi_device *spi)
INIT_WORK(&ks->tx_work, ks8851_tx_work);
INIT_WORK(&ks->rxctrl_work, ks8851_rxctrl_work);
- /* initialise pre-made spi transfer messages */
-
- spi_message_init(&kss->spi_msg1);
- spi_message_add_tail(&kss->spi_xfer1, &kss->spi_msg1);
-
- spi_message_init(&kss->spi_msg2);
- spi_message_add_tail(&kss->spi_xfer2[0], &kss->spi_msg2);
- spi_message_add_tail(&kss->spi_xfer2[1], &kss->spi_msg2);
-
/* setup EEPROM state */
-
ks->eeprom.data = ks;
ks->eeprom.width = PCI_EEPROM_WIDTH_93C46;
ks->eeprom.register_read = ks8851_eeprom_regread;
@@ -1487,7 +1464,6 @@ static int ks8851_probe(struct spi_device *spi)
netif_carrier_off(ks->netdev);
ndev->if_port = IF_PORT_100BASET;
ndev->netdev_ops = &ks8851_netdev_ops;
- ndev->irq = spi->irq;
/* issue a global soft reset to reset the device. */
ks8851_soft_reset(ks, GRR_GSR);
@@ -1529,9 +1505,8 @@ static int ks8851_probe(struct spi_device *spi)
return ret;
}
-static int ks8851_remove(struct spi_device *spi)
+static int ks8851_remove_common(struct device *dev)
{
- struct device *dev = &spi->dev;
struct ks8851_net *priv = dev_get_drvdata(dev);
if (netif_msg_drv(priv))
@@ -1546,6 +1521,42 @@ static int ks8851_remove(struct spi_device *spi)
return 0;
}
+static int ks8851_probe(struct spi_device *spi)
+{
+ struct device *dev = &spi->dev;
+ struct ks8851_net_spi *kss;
+ struct net_device *ndev;
+ struct ks8851_net *ks;
+
+ ndev = devm_alloc_etherdev(dev, sizeof(struct ks8851_net_spi));
+ if (!ndev)
+ return -ENOMEM;
+
+ spi->bits_per_word = 8;
+
+ ks = netdev_priv(ndev);
+ kss = to_ks8851_spi(ks);
+
+ kss->spidev = spi;
+
+ /* initialise pre-made spi transfer messages */
+ spi_message_init(&kss->spi_msg1);
+ spi_message_add_tail(&kss->spi_xfer1, &kss->spi_msg1);
+
+ spi_message_init(&kss->spi_msg2);
+ spi_message_add_tail(&kss->spi_xfer2[0], &kss->spi_msg2);
+ spi_message_add_tail(&kss->spi_xfer2[1], &kss->spi_msg2);
+
+ ndev->irq = spi->irq;
+
+ return ks8851_probe_common(ndev, dev);
+}
+
+static int ks8851_remove(struct spi_device *spi)
+{
+ return ks8851_remove_common(&spi->dev);
+}
+
static const struct of_device_id ks8851_match_table[] = {
{ .compatible = "micrel,ks8851" },
{ }
--
2.25.1
next prev parent reply other threads:[~2020-03-23 23:43 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-23 23:42 [PATCH 00/14] net: ks8851: Unify KS8851 SPI and MLL drivers Marek Vasut
2020-03-23 23:42 ` [PATCH 01/14] net: ks8851: Factor out spi->dev in probe()/remove() Marek Vasut
2020-03-24 1:15 ` Andrew Lunn
2020-03-24 6:46 ` Lukas Wunner
2020-03-23 23:42 ` [PATCH 02/14] net: ks8851: Replace dev_err() with netdev_err() in IRQ handler Marek Vasut
2020-03-24 1:16 ` Andrew Lunn
2020-03-23 23:42 ` [PATCH 03/14] net: ks8851: Pass device pointer into ks8851_init_mac() Marek Vasut
2020-03-24 1:06 ` Andrew Lunn
2020-03-24 7:08 ` Lukas Wunner
2020-03-23 23:42 ` [PATCH 04/14] net: ks8851: Use devm_alloc_etherdev() Marek Vasut
2020-03-24 1:19 ` Andrew Lunn
2020-03-23 23:42 ` [PATCH 05/14] net: ks8851: Use dev_{get,set}_drvdata() Marek Vasut
2020-03-24 1:22 ` Andrew Lunn
2020-03-23 23:42 ` [PATCH 06/14] net: ks8851: Remove ks8851_rdreg32() Marek Vasut
2020-03-24 1:30 ` Andrew Lunn
2020-03-24 12:34 ` Marek Vasut
2020-03-24 7:22 ` Lukas Wunner
2020-03-24 12:37 ` Marek Vasut
2020-03-23 23:42 ` [PATCH 07/14] net: ks8851: Use 16-bit writes to program MAC address Marek Vasut
2020-03-24 1:40 ` Andrew Lunn
2020-03-24 7:17 ` Michal Kubecek
2020-03-24 8:13 ` Lukas Wunner
2020-03-24 12:25 ` Andrew Lunn
2020-03-24 12:36 ` Lukas Wunner
2020-03-24 13:09 ` Marek Vasut
2020-03-24 13:31 ` Marek Vasut
2020-03-24 14:47 ` Lukas Wunner
2020-03-24 14:53 ` Marek Vasut
2020-03-23 23:42 ` [PATCH 08/14] net: ks8851: Use 16-bit read of RXFC register Marek Vasut
2020-03-24 1:50 ` Andrew Lunn
2020-03-24 12:50 ` Marek Vasut
2020-03-24 13:32 ` Andrew Lunn
2020-03-24 10:41 ` Lukas Wunner
2020-03-24 12:42 ` Marek Vasut
2020-03-23 23:42 ` [PATCH 09/14] net: ks8851: Split out SPI specific entries in struct ks8851_net Marek Vasut
2020-03-24 1:55 ` Andrew Lunn
2020-03-24 10:49 ` Lukas Wunner
2020-03-24 12:27 ` Andrew Lunn
2020-03-23 23:42 ` Marek Vasut [this message]
2020-03-24 1:58 ` [PATCH 10/14] net: ks8851: Split out SPI specific code from probe() and remove() Andrew Lunn
2020-03-23 23:43 ` [PATCH 11/14] net: ks8851: Implement register and FIFO accessor callbacks Marek Vasut
2020-03-24 13:45 ` Lukas Wunner
2020-03-24 14:10 ` Marek Vasut
2020-03-24 14:29 ` Lukas Wunner
2020-03-24 14:44 ` Marek Vasut
2020-03-29 14:22 ` Marek Vasut
2020-03-23 23:43 ` [PATCH 12/14] net: ks8851: Separate SPI operations into separate file Marek Vasut
2020-03-23 23:43 ` [PATCH 13/14] net: ks8851: Implement Parallel bus operations Marek Vasut
2020-03-24 8:16 ` kbuild test robot
2020-03-23 23:43 ` [PATCH 14/14] net: ks8851: Remove ks8851_mll.c Marek Vasut
2020-03-24 14:08 ` Lukas Wunner
2020-03-24 14:12 ` Marek Vasut
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=20200323234303.526748-11-marex@denx.de \
--to=marex@denx.de \
--cc=davem@davemloft.net \
--cc=lukas@wunner.de \
--cc=netdev@vger.kernel.org \
--cc=ynezz@true.cz \
--cc=yuehaibing@huawei.com \
/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;
as well as URLs for NNTP newsgroup(s).