From: Marek Vasut <marex@denx.de>
To: netdev@vger.kernel.org
Cc: Marek Vasut <marex@denx.de>, Andrew Lunn <andrew@lunn.ch>,
"David S . Miller" <davem@davemloft.net>,
Lukas Wunner <lukas@wunner.de>, Petr Stetiar <ynezz@true.cz>,
YueHaibing <yuehaibing@huawei.com>
Subject: [PATCH V6 13/20] net: ks8851: Split out SPI specific code from probe() and remove()
Date: Sun, 17 May 2020 02:33:47 +0200 [thread overview]
Message-ID: <20200517003354.233373-14-marex@denx.de> (raw)
In-Reply-To: <20200517003354.233373-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.
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
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>
---
V2: - Add RB from Andrew
- Rework on top of locking patches, drop RB
V3: No change
V4: No change
V5: Pass message enable as parameter to common probe function,
so the MODULE_* bits can be per-driver
V6: No change
---
drivers/net/ethernet/micrel/ks8851.c | 86 ++++++++++++++++------------
1 file changed, 48 insertions(+), 38 deletions(-)
diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c
index 482c65b1accf..4283ba5bee81 100644
--- a/drivers/net/ethernet/micrel/ks8851.c
+++ b/drivers/net/ethernet/micrel/ks8851.c
@@ -1431,27 +1431,15 @@ 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 *netdev, struct device *dev,
+ int msg_en)
{
- struct device *dev = &spi->dev;
- struct ks8851_net_spi *kss;
- struct net_device *netdev;
- struct ks8851_net *ks;
- int ret;
+ struct ks8851_net *ks = netdev_priv(netdev);
unsigned cider;
int gpio;
-
- netdev = devm_alloc_etherdev(dev, sizeof(struct ks8851_net_spi));
- if (!netdev)
- return -ENOMEM;
-
- spi->bits_per_word = 8;
-
- ks = netdev_priv(netdev);
- kss = to_ks8851_spi(ks);
+ int ret;
ks->netdev = netdev;
- kss->spidev = spi;
ks->tx_space = 6144;
gpio = of_get_named_gpio_flags(dev->of_node, "reset-gpios", 0, NULL);
@@ -1497,23 +1485,11 @@ static int ks8851_probe(struct spi_device *spi)
gpio_set_value(gpio, 1);
}
- mutex_init(&kss->lock);
spin_lock_init(&ks->statelock);
- INIT_WORK(&kss->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;
@@ -1527,12 +1503,12 @@ static int ks8851_probe(struct spi_device *spi)
ks->mii.mdio_read = ks8851_phy_read;
ks->mii.mdio_write = ks8851_phy_write;
- dev_info(dev, "message enable is %d\n", msg_enable);
+ dev_info(dev, "message enable is %d\n", msg_en);
/* set the default message enable */
- ks->msg_enable = netif_msg_init(msg_enable, (NETIF_MSG_DRV |
- NETIF_MSG_PROBE |
- NETIF_MSG_LINK));
+ ks->msg_enable = netif_msg_init(msg_en, NETIF_MSG_DRV |
+ NETIF_MSG_PROBE |
+ NETIF_MSG_LINK);
skb_queue_head_init(&ks->txq);
@@ -1544,7 +1520,6 @@ static int ks8851_probe(struct spi_device *spi)
netif_carrier_off(ks->netdev);
netdev->if_port = IF_PORT_100BASET;
netdev->netdev_ops = &ks8851_netdev_ops;
- netdev->irq = spi->irq;
/* issue a global soft reset to reset the device. */
ks8851_soft_reset(ks, GRR_GSR);
@@ -1586,12 +1561,9 @@ 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;
-
- priv = dev_get_drvdata(dev);
+ struct ks8851_net *priv = dev_get_drvdata(dev);
if (netif_msg_drv(priv))
dev_info(dev, "remove\n");
@@ -1605,6 +1577,44 @@ 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 *netdev;
+ struct ks8851_net *ks;
+
+ netdev = devm_alloc_etherdev(dev, sizeof(struct ks8851_net_spi));
+ if (!netdev)
+ return -ENOMEM;
+
+ spi->bits_per_word = 8;
+
+ ks = netdev_priv(netdev);
+ kss = to_ks8851_spi(ks);
+
+ kss->spidev = spi;
+ mutex_init(&kss->lock);
+ INIT_WORK(&kss->tx_work, ks8851_tx_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);
+
+ netdev->irq = spi->irq;
+
+ return ks8851_probe_common(netdev, dev, msg_enable);
+}
+
+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-05-17 0:34 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-17 0:33 [PATCH V6 00/20] net: ks8851: Unify KS8851 SPI and MLL drivers Marek Vasut
2020-05-17 0:33 ` [PATCH V6 01/20] net: ks8851: Factor out spi->dev in probe()/remove() Marek Vasut
2020-05-17 0:33 ` [PATCH V6 02/20] net: ks8851: Rename ndev to netdev in probe Marek Vasut
2020-05-17 0:33 ` [PATCH V6 03/20] net: ks8851: Replace dev_err() with netdev_err() in IRQ handler Marek Vasut
2020-05-17 0:33 ` [PATCH V6 04/20] net: ks8851: Pass device node into ks8851_init_mac() Marek Vasut
2020-05-17 0:33 ` [PATCH V6 05/20] net: ks8851: Use devm_alloc_etherdev() Marek Vasut
2020-05-17 0:33 ` [PATCH V6 06/20] net: ks8851: Use dev_{get,set}_drvdata() Marek Vasut
2020-05-17 0:33 ` [PATCH V6 07/20] net: ks8851: Remove ks8851_rdreg32() Marek Vasut
2020-05-17 0:33 ` [PATCH V6 08/20] net: ks8851: Use 16-bit writes to program MAC address Marek Vasut
2020-05-17 0:33 ` [PATCH V6 09/20] net: ks8851: Use 16-bit read of RXFC register Marek Vasut
2020-05-17 19:44 ` Andrew Lunn
2020-05-17 20:02 ` Marek Vasut
2020-05-17 0:33 ` [PATCH V6 10/20] net: ks8851: Factor out bus lock handling Marek Vasut
2020-05-17 0:33 ` [PATCH V6 11/20] net: ks8851: Factor out SKB receive function Marek Vasut
2020-05-17 0:33 ` [PATCH V6 12/20] net: ks8851: Split out SPI specific entries in struct ks8851_net Marek Vasut
2020-05-17 0:33 ` Marek Vasut [this message]
2020-05-17 0:33 ` [PATCH V6 14/20] net: ks8851: Factor out TX work flush function Marek Vasut
2020-05-17 0:33 ` [PATCH V6 15/20] net: ks8851: Permit overridding interrupt enable register Marek Vasut
2020-05-17 0:33 ` [PATCH V6 16/20] net: ks8851: Implement register, FIFO, lock accessor callbacks Marek Vasut
2020-05-18 16:34 ` Jakub Kicinski
2020-05-18 17:06 ` Marek Vasut
2020-05-18 17:29 ` Jakub Kicinski
2020-05-17 0:33 ` [PATCH V6 17/20] net: ks8851: Separate SPI operations into separate file Marek Vasut
2020-05-17 0:33 ` [PATCH V6 18/20] net: ks8851: Implement Parallel bus operations Marek Vasut
2020-05-18 16:33 ` Jakub Kicinski
2020-05-17 0:33 ` [PATCH V6 19/20] net: ks8851: Remove ks8851_mll.c Marek Vasut
2020-05-17 0:33 ` [PATCH V6 20/20] net: ks8851: Drop define debug and pr_fmt() Marek Vasut
2020-05-17 2:01 ` Joe Perches
2020-05-17 2:28 ` Marek Vasut
2020-05-17 2:37 ` Joe Perches
2020-05-17 2:47 ` Marek Vasut
2020-05-17 2:55 ` Joe Perches
2020-05-18 17:07 ` Marek Vasut
2020-05-17 2:02 ` [PATCH V6 00/20] net: ks8851: Unify KS8851 SPI and MLL drivers David Miller
2020-05-17 2:27 ` Marek Vasut
2020-05-17 19:26 ` Andrew Lunn
2020-05-17 20:08 ` Marek Vasut
2020-05-17 7:13 ` Lukas Wunner
2020-05-17 12:36 ` Marek Vasut
2020-05-17 19:16 ` Andrew Lunn
2020-05-17 19:30 ` David Miller
2020-05-21 13:11 ` 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=20200517003354.233373-14-marex@denx.de \
--to=marex@denx.de \
--cc=andrew@lunn.ch \
--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).