Merge tag 'v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

[karo-tx-linux.git] / drivers / usb / phy / phy-am335x.c

diff --git a/drivers/usb/phy/phy-am335x.c b/drivers/usb/phy/phy-am335x.c
index f490e740c6c11cfc721c2ad49aef0ec261dbf9de..f69c1c5168ad24892b296a4645ac937a49138a94 100644 (file)
--- a/drivers/usb/phy/phy-am335x.c
+++ b/drivers/usb/phy/phy-am335x.c
@@ -125,16 +125,10 @@ static int am335x_phy_resume(struct device *dev)
 
        return 0;
 }
-
-static const struct dev_pm_ops am335x_pm_ops = {
-       SET_SYSTEM_SLEEP_PM_OPS(am335x_phy_suspend, am335x_phy_resume)
-};
-
-#define DEV_PM_OPS     (&am335x_pm_ops)
-#else
-#define DEV_PM_OPS     NULL
 #endif
 
+static SIMPLE_DEV_PM_OPS(am335x_pm_ops, am335x_phy_suspend, am335x_phy_resume);
+
 static const struct of_device_id am335x_phy_ids[] = {
        { .compatible = "ti,am335x-usb-phy" },
        { }
@@ -146,8 +140,7 @@ static struct platform_driver am335x_phy_driver = {
        .remove         = am335x_phy_remove,
        .driver         = {
                .name   = "am335x-phy-driver",
-               .owner  = THIS_MODULE,
-               .pm = DEV_PM_OPS,
+               .pm = &am335x_pm_ops,
                .of_match_table = am335x_phy_ids,
        },
 };