stmmac: convert to dev_pm_ops.

[net-next-2.6.git] / drivers / net / stmmac / stmmac.h

diff --git a/drivers/net/stmmac/stmmac.h b/drivers/net/stmmac/stmmac.h
index 31575670d862531ece96fdfc946b4ef1e84816d3..eb258e2319e13592f1bf7658314ee90600a9d61d 100644 (file)
--- a/drivers/net/stmmac/stmmac.h
+++ b/drivers/net/stmmac/stmmac.h
@@ -77,7 +77,6 @@ struct stmmac_priv {
        spinlock_t lock;
        int wolopts;
        int wolenabled;
-       int shutdown;
 #ifdef CONFIG_STMMAC_TIMER
        struct stmmac_timer *tm;
 #endif
@@ -87,28 +86,6 @@ struct stmmac_priv {
        struct plat_stmmacenet_data *plat;
 };
 
-#ifdef CONFIG_STM_DRIVERS
-#include <linux/stm/pad.h>
-static inline int stmmac_claim_resource(struct platform_device *pdev)
-{
-       int ret = 0;
-       struct plat_stmmacenet_data *plat_dat = pdev->dev.platform_data;
-
-       /* Pad routing setup */
-       if (IS_ERR(devm_stm_pad_claim(&pdev->dev, plat_dat->pad_config,
-                       dev_name(&pdev->dev)))) {
-               printk(KERN_ERR "%s: Failed to request pads!\n", __func__);
-               ret = -ENODEV;
-       }
-       return ret;
-}
-#else
-static inline int stmmac_claim_resource(struct platform_device *pdev)
-{
-       return 0;
-}
-#endif
-
 extern int stmmac_mdio_unregister(struct net_device *ndev);
 extern int stmmac_mdio_register(struct net_device *ndev);
 extern void stmmac_set_ethtool_ops(struct net_device *netdev);