Fixes, cleanup and modernization for macmace driver
Subsystems (2)
cover Fixes, cleanup and modernization for macmace driver
Changes since v4 of combined patch series:
- Removed redundant and non-portable MACH_IS_MAC tests.
- Omitted patches unrelated to macmace driver.
Finn Thain (2):
net/macmace: Drop redundant MACH_IS_MAC test
net/macmace: Fix and clean up log messages
drivers/net/ethernet/apple/macmace.c | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-)
Signature · 1 line
2.16.1
PATCH 1/2 net/macmace: Drop redundant MACH_IS_MAC test
The MACH_IS_MAC test is redundant here because the platform device won't get registered unless MACH_IS_MAC.
Adopt module_platform_driver() convention.
--- drivers/net/ethernet/apple/macmace.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-)
drivers/net/ethernet/apple/macmace.c +1 -15
@@ -770,18 +770,4 @@ static struct platform_driver mac_mace_driver = { }, }; -static int __init mac_mace_init_module (void ) -{ -if (!MACH_IS_MAC ) -return -ENODEV ; - -return platform_driver_register (&mac_mace_driver); -} - -static void __exit mac_mace_cleanup_module(void) -{ -platform_driver_unregister (&mac_mace_driver); -} - -module_init (mac_mace_init_module); -module_exit (mac_mace_cleanup_module); +module_platform_driver (mac_mace_driver);
Signature · 1 line
2.16.1
PATCH 2/2 net/macmace: Fix and clean up log messages
In reply to Finn ThainDon't log the unexpanded "eth%d" format string.
Log the chip revision in the probe message (consistent with mace.c). Drop redundant debug messages for FIFO events recorded in the interface statistics (also consistent with mace.c).
--- drivers/net/ethernet/apple/macmace.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/net/ethernet/apple/macmace.c +3 -6
@@ -247,8 +247,8 @@ static int mace_probe(struct platform_device *pdev) dev->netdev_ops = &mace_netdev_ops; dev->watchdog_timeo =TX_TIMEOUT ; -printk (KERN_INFO "%s: 68K MACE, hardware address %pM\n" , - dev->name, dev->dev_addr); +pr_info ("Onboard MACE, hardware address %pM, chip revision 0x%04X\n" , + dev->dev_addr, mp->chipid); err =register_netdev (dev);if (!err)
@@ -589,7 +589,6 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id)else if (fs & (UFLO |LCOL |RTRY )) { ++dev->stats.tx_aborted_errors;if (mb->xmtfs &UFLO ) { -printk (KERN_ERR "%s: DMA underrun.\n" , dev->name); dev->stats.tx_fifo_errors++;mace_txdma_reset (dev); }
@@ -644,10 +643,8 @@ static void mace_dma_rx_frame(struct net_device *dev, struct mace_frame *mf)if (frame_status & (RS_OFLO |RS_CLSN |RS_FRAMERR |RS_FCSERR )) { dev->stats.rx_errors++; -if (frame_status &RS_OFLO ) { -printk (KERN_DEBUG "%s: fifo overflow.\n" , dev->name); +if (frame_status &RS_OFLO ) dev->stats.rx_fifo_errors++; - }if (frame_status &RS_CLSN ) dev->stats.collisions++;if (frame_status &RS_FRAMERR )
Signature · 1 line
2.16.1
Re: [PATCH net 1/2] net/macmace: Drop redundant MACH_IS_MAC test
In reply to Finn ThainQuoted 6 lines · Finn Thain
The
MACH_IS_MACtest is redundant here because the platform device won't get registered unlessMACH_IS_MAC.
Adoptmodule_platform_driver()convention.Cc Geert Uytterhoeven <[email protected]>Signed-off-by Finn Thain <[email protected]>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
David Miller
maintainerFrom: Finn Thain <[email protected]>
Date: Tue, 27 Feb 2018 23:22:32 -0500 (EST)
Quoted 3 lines
Changes since v4 of combined patch series:
- Removed redundant and non-portableMACH_IS_MACtests.
- Omitted patches unrelated to macmace driver.
Series applied, thank you.