drivers/net: request_irq - Remove unnecessary leading & from second arg

[deliverable/linux.git] / drivers / net / sh_eth.c

diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index f49d0800c1d103c70bdb37f59cba9f00047b5285..c88bc1013047573b9945658970ffd06b082389f0 100644 (file)
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -30,6 +30,8 @@
 #include <linux/phy.h>
 #include <linux/cache.h>
 #include <linux/io.h>
+#include <linux/pm_runtime.h>
+#include <asm/cacheflush.h>
 
 #include "sh_eth.h"
 
@@ -298,16 +300,20 @@ static void update_mac_address(struct net_device *ndev)
  * When you want use this device, you must set MAC address in bootloader.
  *
  */
-static void read_mac_address(struct net_device *ndev)
+static void read_mac_address(struct net_device *ndev, unsigned char *mac)
 {
        u32 ioaddr = ndev->base_addr;
 
-       ndev->dev_addr[0] = (ctrl_inl(ioaddr + MAHR) >> 24);
-       ndev->dev_addr[1] = (ctrl_inl(ioaddr + MAHR) >> 16) & 0xFF;
-       ndev->dev_addr[2] = (ctrl_inl(ioaddr + MAHR) >> 8) & 0xFF;
-       ndev->dev_addr[3] = (ctrl_inl(ioaddr + MAHR) & 0xFF);
-       ndev->dev_addr[4] = (ctrl_inl(ioaddr + MALR) >> 8) & 0xFF;
-       ndev->dev_addr[5] = (ctrl_inl(ioaddr + MALR) & 0xFF);
+       if (mac[0] || mac[1] || mac[2] || mac[3] || mac[4] || mac[5]) {
+               memcpy(ndev->dev_addr, mac, 6);
+       } else {
+               ndev->dev_addr[0] = (ctrl_inl(ioaddr + MAHR) >> 24);
+               ndev->dev_addr[1] = (ctrl_inl(ioaddr + MAHR) >> 16) & 0xFF;
+               ndev->dev_addr[2] = (ctrl_inl(ioaddr + MAHR) >> 8) & 0xFF;
+               ndev->dev_addr[3] = (ctrl_inl(ioaddr + MAHR) & 0xFF);
+               ndev->dev_addr[4] = (ctrl_inl(ioaddr + MALR) >> 8) & 0xFF;
+               ndev->dev_addr[5] = (ctrl_inl(ioaddr + MALR) & 0xFF);
+       }
 }
 
 struct bb_info {
@@ -1008,7 +1014,9 @@ static int sh_eth_open(struct net_device *ndev)
        int ret = 0;
        struct sh_eth_private *mdp = netdev_priv(ndev);
 
-       ret = request_irq(ndev->irq, &sh_eth_interrupt,
+       pm_runtime_get_sync(&mdp->pdev->dev);
+
+       ret = request_irq(ndev->irq, sh_eth_interrupt,
 #if defined(CONFIG_CPU_SUBTYPE_SH7763) || defined(CONFIG_CPU_SUBTYPE_SH7764)
                                IRQF_SHARED,
 #else
@@ -1044,6 +1052,7 @@ static int sh_eth_open(struct net_device *ndev)
 
 out_free_irq:
        free_irq(ndev->irq, ndev);
+       pm_runtime_put_sync(&mdp->pdev->dev);
        return ret;
 }
 
@@ -1175,6 +1184,8 @@ static int sh_eth_close(struct net_device *ndev)
        ringsize = sizeof(struct sh_eth_txdesc) * TX_RING_SIZE;
        dma_free_coherent(NULL, ringsize, mdp->tx_ring, mdp->tx_desc_dma);
 
+       pm_runtime_put_sync(&mdp->pdev->dev);
+
        return 0;
 }
 
@@ -1183,6 +1194,8 @@ static struct net_device_stats *sh_eth_get_stats(struct net_device *ndev)
        struct sh_eth_private *mdp = netdev_priv(ndev);
        u32 ioaddr = ndev->base_addr;
 
+       pm_runtime_get_sync(&mdp->pdev->dev);
+
        mdp->stats.tx_dropped += ctrl_inl(ioaddr + TROCR);
        ctrl_outl(0, ioaddr + TROCR);   /* (write clear) */
        mdp->stats.collisions += ctrl_inl(ioaddr + CDCR);
@@ -1198,6 +1211,8 @@ static struct net_device_stats *sh_eth_get_stats(struct net_device *ndev)
        mdp->stats.tx_carrier_errors += ctrl_inl(ioaddr + CNDCR);
        ctrl_outl(0, ioaddr + CNDCR);   /* (write clear) */
 #endif
+       pm_runtime_put_sync(&mdp->pdev->dev);
+
        return &mdp->stats;
 }
 
@@ -1406,6 +1421,9 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
 
        mdp = netdev_priv(ndev);
        spin_lock_init(&mdp->lock);
+       mdp->pdev = pdev;
+       pm_runtime_enable(&pdev->dev);
+       pm_runtime_resume(&pdev->dev);
 
        pd = (struct sh_eth_plat_data *)(pdev->dev.platform_data);
        /* get PHY ID */
@@ -1427,7 +1445,7 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
        mdp->post_fw = POST_FW >> (devno << 1);
 
        /* read and set MAC address */
-       read_mac_address(ndev);
+       read_mac_address(ndev, pd->mac_addr);
 
        /* First device only init */
        if (!devno) {
@@ -1481,18 +1499,37 @@ static int sh_eth_drv_remove(struct platform_device *pdev)
        sh_mdio_release(ndev);
        unregister_netdev(ndev);
        flush_scheduled_work();
-
+       pm_runtime_disable(&pdev->dev);
        free_netdev(ndev);
        platform_set_drvdata(pdev, NULL);
 
        return 0;
 }
 
+static int sh_eth_runtime_nop(struct device *dev)
+{
+       /*
+        * Runtime PM callback shared between ->runtime_suspend()
+        * and ->runtime_resume(). Simply returns success.
+        *
+        * This driver re-initializes all registers after
+        * pm_runtime_get_sync() anyway so there is no need
+        * to save and restore registers here.
+        */
+       return 0;
+}
+
+static struct dev_pm_ops sh_eth_dev_pm_ops = {
+       .runtime_suspend = sh_eth_runtime_nop,
+       .runtime_resume = sh_eth_runtime_nop,
+};
+
 static struct platform_driver sh_eth_driver = {
        .probe = sh_eth_drv_probe,
        .remove = sh_eth_drv_remove,
        .driver = {
                   .name = CARDNAME,
+                  .pm = &sh_eth_dev_pm_ops,
        },
 };