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 V2 06/14] net: ks8851: Use dev_{get,set}_drvdata()
Date: Wed, 25 Mar 2020 16:05:35 +0100 [thread overview]
Message-ID: <20200325150543.78569-7-marex@denx.de> (raw)
In-Reply-To: <20200325150543.78569-1-marex@denx.de>
Replace spi_{get,set}_drvdata() with dev_{get,set}_drvdata(), which
works for both SPI and platform drivers. This is done in preparation
for unifying the KS8851 SPI and parallel bus drivers.
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>
---
V2: Reverse xmas tree.
---
drivers/net/ethernet/micrel/ks8851.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c
index f0b70b79e7ed..c2f381a7b3f3 100644
--- a/drivers/net/ethernet/micrel/ks8851.c
+++ b/drivers/net/ethernet/micrel/ks8851.c
@@ -1518,7 +1518,7 @@ static int ks8851_probe(struct spi_device *spi)
netdev->ethtool_ops = &ks8851_ethtool_ops;
SET_NETDEV_DEV(netdev, dev);
- spi_set_drvdata(spi, ks);
+ dev_set_drvdata(dev, ks);
netif_carrier_off(ks->netdev);
netdev->if_port = IF_PORT_100BASET;
@@ -1567,8 +1567,10 @@ static int ks8851_probe(struct spi_device *spi)
static int ks8851_remove(struct spi_device *spi)
{
- struct ks8851_net *priv = spi_get_drvdata(spi);
struct device *dev = &spi->dev;
+ struct ks8851_net *priv;
+
+ priv = dev_get_drvdata(dev);
if (netif_msg_drv(priv))
dev_info(dev, "remove\n");
--
2.25.1
next prev parent reply other threads:[~2020-03-25 15:06 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-25 15:05 [PATCH V2 00/14] net: ks8851: Unify KS8851 SPI and MLL drivers Marek Vasut
2020-03-25 15:05 ` [PATCH V2 01/14] net: ks8851: Factor out spi->dev in probe()/remove() Marek Vasut
2020-03-25 15:05 ` [PATCH V2 02/14] net: ks8851: Rename ndev to netdev in probe Marek Vasut
2020-03-25 15:05 ` [PATCH V2 03/14] net: ks8851: Replace dev_err() with netdev_err() in IRQ handler Marek Vasut
2020-03-25 15:05 ` [PATCH V2 04/14] net: ks8851: Pass device node into ks8851_init_mac() Marek Vasut
2020-03-25 15:05 ` [PATCH V2 05/14] net: ks8851: Use devm_alloc_etherdev() Marek Vasut
2020-03-25 15:05 ` Marek Vasut [this message]
2020-03-25 15:05 ` [PATCH V2 07/14] net: ks8851: Remove ks8851_rdreg32() Marek Vasut
2020-03-25 15:05 ` [PATCH V2 08/14] net: ks8851: Use 16-bit writes to program MAC address Marek Vasut
2020-03-25 16:56 ` Michal Kubecek
2020-03-25 17:05 ` Marek Vasut
2020-03-25 17:30 ` Michal Kubecek
2020-03-27 18:16 ` Marek Vasut
2020-03-25 15:05 ` [PATCH V2 09/14] net: ks8851: Use 16-bit read of RXFC register Marek Vasut
2020-03-25 15:05 ` [PATCH V2 10/14] net: ks8851: Split out SPI specific entries in struct ks8851_net Marek Vasut
2020-03-25 15:05 ` [PATCH V2 11/14] net: ks8851: Split out SPI specific code from probe() and remove() Marek Vasut
2020-03-25 15:05 ` [PATCH V2 12/14] net: ks8851: Separate SPI operations into separate file Marek Vasut
2020-03-25 15:05 ` [PATCH V2 13/14] net: ks8851: Implement Parallel bus operations Marek Vasut
2020-03-25 15:05 ` [PATCH V2 14/14] net: ks8851: Remove ks8851_mll.c Marek Vasut
2020-03-26 19:02 ` [PATCH V2 00/14] net: ks8851: Unify KS8851 SPI and MLL drivers Lukas Wunner
2020-03-27 18:18 ` Marek Vasut
2020-03-27 19:25 ` 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=20200325150543.78569-7-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).