From: Jingoo Han Date: Tue, 8 Jul 2014 11:51:34 +0000 (+0900) Subject: usb: phy: am335x: Use SIMPLE_DEV_PM_OPS macro X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1e32cda86d360ade35d2b3328b46ecf6ef5836db;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git usb: phy: am335x: Use SIMPLE_DEV_PM_OPS macro Use SIMPLE_DEV_PM_OPS macro and remove DEV_PM_OPS macro, in order to make the code simpler. Acked-by: Roger Quadros Signed-off-by: Jingoo Han Signed-off-by: Felipe Balbi --- diff --git a/drivers/usb/phy/phy-am335x.c b/drivers/usb/phy/phy-am335x.c index 585e50cb1980..b70e05537180 100644 --- a/drivers/usb/phy/phy-am335x.c +++ b/drivers/usb/phy/phy-am335x.c @@ -122,16 +122,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" }, { } @@ -144,7 +138,7 @@ static struct platform_driver am335x_phy_driver = { .driver = { .name = "am335x-phy-driver", .owner = THIS_MODULE, - .pm = DEV_PM_OPS, + .pm = &am335x_pm_ops, .of_match_table = am335x_phy_ids, }, };