Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'net-ethernet-litex-minor-improvment-for-the-codebase'
Inochi Amaoto says:
====================
net: ethernet: litex: minor improvment for the codebase
Improve the litex code for using the device managed function to register
netdev and replace all the "pdev->dev" with dev pointer instead.
====================
Link: https://patch.msgid.link/20260227003351.752934-1-inochiama@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+7
-14
+7
-14
drivers/net/ethernet/litex/litex_liteeth.c
+7
-14
drivers/net/ethernet/litex/litex_liteeth.c
···
232
232
233
233
static int liteeth_probe(struct platform_device *pdev)
234
234
{
235
+
struct device *dev = &pdev->dev;
235
236
struct net_device *netdev;
236
237
void __iomem *buf_base;
237
238
struct liteeth *priv;
238
239
int irq, err;
239
240
240
-
netdev = devm_alloc_etherdev(&pdev->dev, sizeof(*priv));
241
+
netdev = devm_alloc_etherdev(dev, sizeof(*priv));
241
242
if (!netdev)
242
243
return -ENOMEM;
243
244
···
247
246
248
247
priv = netdev_priv(netdev);
249
248
priv->netdev = netdev;
250
-
priv->dev = &pdev->dev;
249
+
priv->dev = dev;
251
250
252
-
netdev->tstats = devm_netdev_alloc_pcpu_stats(&pdev->dev,
251
+
netdev->tstats = devm_netdev_alloc_pcpu_stats(dev,
253
252
struct pcpu_sw_netstats);
254
253
if (!netdev->tstats)
255
254
return -ENOMEM;
···
277
276
priv->tx_base = buf_base + priv->num_rx_slots * priv->slot_size;
278
277
priv->tx_slot = 0;
279
278
280
-
err = of_get_ethdev_address(pdev->dev.of_node, netdev);
279
+
err = of_get_ethdev_address(dev->of_node, netdev);
281
280
if (err)
282
281
eth_hw_addr_random(netdev);
283
282
284
283
netdev->netdev_ops = &liteeth_netdev_ops;
285
284
286
-
err = register_netdev(netdev);
285
+
err = devm_register_netdev(dev, netdev);
287
286
if (err) {
288
-
dev_err(&pdev->dev, "Failed to register netdev %d\n", err);
287
+
dev_err(dev, "Failed to register netdev %d\n", err);
289
288
return err;
290
289
}
291
290
···
293
292
netdev->irq, priv->num_tx_slots, priv->num_rx_slots, priv->slot_size);
294
293
295
294
return 0;
296
-
}
297
-
298
-
static void liteeth_remove(struct platform_device *pdev)
299
-
{
300
-
struct net_device *netdev = platform_get_drvdata(pdev);
301
-
302
-
unregister_netdev(netdev);
303
295
}
304
296
305
297
static const struct of_device_id liteeth_of_match[] = {
···
303
309
304
310
static struct platform_driver liteeth_driver = {
305
311
.probe = liteeth_probe,
306
-
.remove = liteeth_remove,
307
312
.driver = {
308
313
.name = DRV_NAME,
309
314
.of_match_table = liteeth_of_match,