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 02/20] net: ks8851: Rename ndev to netdev in probe
Date: Sun, 17 May 2020 02:33:36 +0200 [thread overview]
Message-ID: <20200517003354.233373-3-marex@denx.de> (raw)
In-Reply-To: <20200517003354.233373-1-marex@denx.de>
Rename ndev variable to netdev for the sake of consistency.
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: New patch
V3: No change
V4: No change
V5: No change
V6: No change
---
drivers/net/ethernet/micrel/ks8851.c | 30 ++++++++++++++--------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c
index e32ef9403803..2b85072993c5 100644
--- a/drivers/net/ethernet/micrel/ks8851.c
+++ b/drivers/net/ethernet/micrel/ks8851.c
@@ -1414,21 +1414,21 @@ static SIMPLE_DEV_PM_OPS(ks8851_pm_ops, ks8851_suspend, ks8851_resume);
static int ks8851_probe(struct spi_device *spi)
{
struct device *dev = &spi->dev;
- struct net_device *ndev;
+ struct net_device *netdev;
struct ks8851_net *ks;
int ret;
unsigned cider;
int gpio;
- ndev = alloc_etherdev(sizeof(struct ks8851_net));
- if (!ndev)
+ netdev = alloc_etherdev(sizeof(struct ks8851_net));
+ if (!netdev)
return -ENOMEM;
spi->bits_per_word = 8;
- ks = netdev_priv(ndev);
+ ks = netdev_priv(netdev);
- ks->netdev = ndev;
+ ks->netdev = netdev;
ks->spidev = spi;
ks->tx_space = 6144;
@@ -1500,7 +1500,7 @@ static int ks8851_probe(struct spi_device *spi)
ks->eeprom.register_write = ks8851_eeprom_regwrite;
/* setup mii state */
- ks->mii.dev = ndev;
+ ks->mii.dev = netdev;
ks->mii.phy_id = 1,
ks->mii.phy_id_mask = 1;
ks->mii.reg_num_mask = 0xf;
@@ -1516,15 +1516,15 @@ static int ks8851_probe(struct spi_device *spi)
skb_queue_head_init(&ks->txq);
- ndev->ethtool_ops = &ks8851_ethtool_ops;
- SET_NETDEV_DEV(ndev, dev);
+ netdev->ethtool_ops = &ks8851_ethtool_ops;
+ SET_NETDEV_DEV(netdev, dev);
spi_set_drvdata(spi, ks);
netif_carrier_off(ks->netdev);
- ndev->if_port = IF_PORT_100BASET;
- ndev->netdev_ops = &ks8851_netdev_ops;
- ndev->irq = spi->irq;
+ 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);
@@ -1543,14 +1543,14 @@ static int ks8851_probe(struct spi_device *spi)
ks8851_read_selftest(ks);
ks8851_init_mac(ks);
- ret = register_netdev(ndev);
+ ret = register_netdev(netdev);
if (ret) {
dev_err(dev, "failed to register network device\n");
goto err_netdev;
}
- netdev_info(ndev, "revision %d, MAC %pM, IRQ %d, %s EEPROM\n",
- CIDER_REV_GET(cider), ndev->dev_addr, ndev->irq,
+ netdev_info(netdev, "revision %d, MAC %pM, IRQ %d, %s EEPROM\n",
+ CIDER_REV_GET(cider), netdev->dev_addr, netdev->irq,
ks->rc_ccr & CCR_EEPROM ? "has" : "no");
return 0;
@@ -1564,7 +1564,7 @@ static int ks8851_probe(struct spi_device *spi)
regulator_disable(ks->vdd_io);
err_reg_io:
err_gpio:
- free_netdev(ndev);
+ free_netdev(netdev);
return ret;
}
--
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 ` Marek Vasut [this message]
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 ` [PATCH V6 13/20] net: ks8851: Split out SPI specific code from probe() and remove() Marek Vasut
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-3-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).