Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge branch 'net-vertexcom-mse102x-minor-clean-ups'

Stefan Wahren says:

====================
net: vertexcom: mse102x: Minor clean-ups

This series provides some minor clean-ups for the Vertexcom MSE102x
driver.
====================

Link: https://patch.msgid.link/20240827191000.3244-1-wahrenst@gmx.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

+7 -13
+7 -13
drivers/net/ethernet/vertexcom/mse102x.c
··· 377 377 int ret; 378 378 bool first = true; 379 379 380 - if (txb->len < 60) 381 - pad = 60 - txb->len; 380 + if (txb->len < ETH_ZLEN) 381 + pad = ETH_ZLEN - txb->len; 382 382 383 383 while (1) { 384 384 mse102x_tx_cmd_spi(mse, CMD_RTS | (txb->len + pad)); ··· 451 451 452 452 if (ret == -ETIMEDOUT) { 453 453 if (netif_msg_timer(mse)) 454 - netdev_err(mse->ndev, "tx work timeout\n"); 454 + netdev_err_once(mse->ndev, "tx work timeout\n"); 455 455 456 456 mse->stats.tx_timeout++; 457 457 } ··· 485 485 486 486 if (ret) { 487 487 eth_hw_addr_random(ndev); 488 - netdev_err(ndev, "Using random MAC address: %pM\n", 489 - ndev->dev_addr); 488 + dev_warn(ndev->dev.parent, "Using random MAC address: %pM\n", 489 + ndev->dev_addr); 490 490 } 491 491 } 492 492 ··· 622 622 623 623 /* driver bus management functions */ 624 624 625 - #ifdef CONFIG_PM_SLEEP 626 - 627 625 static int mse102x_suspend(struct device *dev) 628 626 { 629 627 struct mse102x_net *mse = dev_get_drvdata(dev); ··· 647 649 648 650 return 0; 649 651 } 650 - #endif 651 652 652 - static SIMPLE_DEV_PM_OPS(mse102x_pm_ops, mse102x_suspend, mse102x_resume); 653 + static DEFINE_SIMPLE_DEV_PM_OPS(mse102x_pm_ops, mse102x_suspend, mse102x_resume); 653 654 654 655 static int mse102x_probe_spi(struct spi_device *spi) 655 656 { ··· 733 736 struct mse102x_net *mse = dev_get_drvdata(&spi->dev); 734 737 struct mse102x_net_spi *mses = to_mse102x_spi(mse); 735 738 736 - if (netif_msg_drv(mse)) 737 - dev_info(&spi->dev, "remove\n"); 738 - 739 739 mse102x_remove_device_debugfs(mses); 740 740 unregister_netdev(mse->ndev); 741 741 } ··· 755 761 .driver = { 756 762 .name = DRV_NAME, 757 763 .of_match_table = mse102x_match_table, 758 - .pm = &mse102x_pm_ops, 764 + .pm = pm_sleep_ptr(&mse102x_pm_ops), 759 765 }, 760 766 .probe = mse102x_probe_spi, 761 767 .remove = mse102x_remove_spi,