net: phy: remove PM ops from MDIO bus

Current implementation of MDIO bus PM ops doesn't actually implement
bus-specific PM ops but just calls PM ops defined on a device level
what doesn't seem to be fully in line with the core PM model.

When looking e.g. at __device_suspend() the PM core looks for PM ops
of a device in a specific order:
1. device PM domain
2. device type
3. device class
4. device bus

I think it has good reason that there's no PM ops on device level.

Now that a device type representation of PHY's as special type of MDIO
devices was added (only user of MDIO bus PM ops), the MDIO bus
PM ops can be removed including member pm of struct mdio_device.

If for some other type of MDIO device PM ops are needed, it should be
modeled as struct device_type as well.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 24b5511222c8fd5d92f93e86c68292decb57e17e..98f4b1f706df427f31be8cd031e12dfa525552e2 100644 (file)
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -717,58 +717,10 @@ static int mdio_uevent(struct device *dev, struct kobj_uevent_env *env)
        return 0;
 }
 
-#ifdef CONFIG_PM
-static int mdio_bus_suspend(struct device *dev)
-{
-       struct mdio_device *mdio = to_mdio_device(dev);
-
-       if (mdio->pm_ops && mdio->pm_ops->suspend)
-               return mdio->pm_ops->suspend(dev);
-
-       return 0;
-}
-
-static int mdio_bus_resume(struct device *dev)
-{
-       struct mdio_device *mdio = to_mdio_device(dev);
-
-       if (mdio->pm_ops && mdio->pm_ops->resume)
-               return mdio->pm_ops->resume(dev);
-
-       return 0;
-}
-
-static int mdio_bus_restore(struct device *dev)
-{
-       struct mdio_device *mdio = to_mdio_device(dev);
-
-       if (mdio->pm_ops && mdio->pm_ops->restore)
-               return mdio->pm_ops->restore(dev);
-
-       return 0;
-}
-
-static const struct dev_pm_ops mdio_bus_pm_ops = {
-       .suspend = mdio_bus_suspend,
-       .resume = mdio_bus_resume,
-       .freeze = mdio_bus_suspend,
-       .thaw = mdio_bus_resume,
-       .restore = mdio_bus_restore,
-};
-
-#define MDIO_BUS_PM_OPS (&mdio_bus_pm_ops)
-
-#else
-
-#define MDIO_BUS_PM_OPS NULL
-
-#endif /* CONFIG_PM */
-
 struct bus_type mdio_bus_type = {
        .name           = "mdio_bus",
        .match          = mdio_bus_match,
        .uevent         = mdio_uevent,
-       .pm             = MDIO_BUS_PM_OPS,
 };
 EXPORT_SYMBOL(mdio_bus_type);
 

diff --git a/include/linux/mdio.h b/include/linux/mdio.h
index 2cfffe586885c2ffffefaed8f1dbda76db2bd71f..bfa7114167d71f897b0c25807a38d8f373aee3b9 100644 (file)
--- a/include/linux/mdio.h
+++ b/include/linux/mdio.h
@@ -29,7 +29,6 @@ enum mdio_mutex_lock_class {
 struct mdio_device {
        struct device dev;
 
-       const struct dev_pm_ops *pm_ops;
        struct mii_bus *bus;
        char modalias[MDIO_NAME_SIZE];