Merge branch 'macmace-cleanups'

Finn Thain says:

====================
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.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 21 deletions

diff --git a/drivers/net/ethernet/apple/macmace.c b/drivers/net/ethernet/apple/macmace.c
index f17a160dbff2..137cbb470af2 100644
--- a/drivers/net/ethernet/apple/macmace.c
+++ b/drivers/net/ethernet/apple/macmace.c
@@ -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)
@@ -770,18 +767,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);