[PATCH] i2c: busses: Convert to DEFINE_SIMPLE_DEV_PM_OPS()
Triet Hoang <[email protected]>
| Newsgroups | org.kernel.vger.linux-i2c,org.infradead.lists.linux-arm-kernel,org.infradead.lists.linux-rockchip,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
Convert the deprecated SIMPLE_DEV_PM_OPS to DEFINE_SIMPLE_DEV_PM_OPS and pm_sleep_ptr(). This lets us drop the __maybe_unused annotations from its suspend and resume callbacks, and reduces kernel size in case CONFIG_PM or CONFIG_PM_SLEEP is disabled. Signed-off-by: Triet Hoang <[email protected]> --- drivers/i2c/busses/i2c-eg20t.c | 8 ++++---- drivers/i2c/busses/i2c-mpc.c | 8 ++++---- drivers/i2c/busses/i2c-rk3x.c | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/i2c/busses/i2c-eg20t.c b/drivers/i2c/busses/i2c-eg20t.c index 8c67ab4f2aad..405229cf8f1d 100644 --- a/drivers/i2c/busses/i2c-eg20t.c +++ b/drivers/i2c/busses/i2c-eg20t.c @@ -829,7 +829,7 @@ static void pch_i2c_remove(struct pci_dev *pdev) kfree(adap_info); } -static int __maybe_unused pch_i2c_suspend(struct device *dev) +static int pch_i2c_suspend(struct device *dev) { int i; struct pci_dev *pdev = to_pci_dev(dev); @@ -857,7 +857,7 @@ static int __maybe_unused pch_i2c_suspend(struct device *dev) return 0; } -static int __maybe_unused pch_i2c_resume(struct device *dev) +static int pch_i2c_resume(struct device *dev) { int i; struct adapter_info *adap_info = dev_get_drvdata(dev); @@ -870,14 +870,14 @@ static int __maybe_unused pch_i2c_resume(struct device *dev) return 0; } -static SIMPLE_DEV_PM_OPS(pch_i2c_pm_ops, pch_i2c_suspend, pch_i2c_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(pch_i2c_pm_ops, pch_i2c_suspend, pch_i2c_resume); static struct pci_driver pch_pcidriver = { .name = KBUILD_MODNAME, .id_table = pch_pcidev_id, .probe = pch_i2c_probe, .remove = pch_i2c_remove, - .driver.pm = &pch_i2c_pm_ops, + .driver.pm = pm_sleep_ptr(&pch_i2c_pm_ops), }; module_pci_driver(pch_pcidriver); diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c index a21fa45bd64c..fc7bc0ddbeee 100644 --- a/drivers/i2c/busses/i2c-mpc.c +++ b/drivers/i2c/busses/i2c-mpc.c @@ -880,7 +880,7 @@ static void fsl_i2c_remove(struct platform_device *op) i2c_del_adapter(&i2c->adap); }; -static int __maybe_unused mpc_i2c_suspend(struct device *dev) +static int mpc_i2c_suspend(struct device *dev) { struct mpc_i2c *i2c = dev_get_drvdata(dev); @@ -890,7 +890,7 @@ static int __maybe_unused mpc_i2c_suspend(struct device *dev) return 0; } -static int __maybe_unused mpc_i2c_resume(struct device *dev) +static int mpc_i2c_resume(struct device *dev) { struct mpc_i2c *i2c = dev_get_drvdata(dev); @@ -899,7 +899,7 @@ static int __maybe_unused mpc_i2c_resume(struct device *dev) return 0; } -static SIMPLE_DEV_PM_OPS(mpc_i2c_pm_ops, mpc_i2c_suspend, mpc_i2c_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(mpc_i2c_pm_ops, mpc_i2c_suspend, mpc_i2c_resume); static const struct mpc_i2c_data mpc_i2c_data_512x = { .setup = mpc_i2c_setup_512x, @@ -942,7 +942,7 @@ static struct platform_driver mpc_i2c_driver = { .driver = { .name = "mpc-i2c", .of_match_table = mpc_i2c_of_match, - .pm = &mpc_i2c_pm_ops, + .pm = pm_sleep_ptr(&mpc_i2c_pm_ops), }, }; diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c index fcede9f6ed54..878bf42c4d73 100644 --- a/drivers/i2c/busses/i2c-rk3x.c +++ b/drivers/i2c/busses/i2c-rk3x.c @@ -1145,7 +1145,7 @@ static int rk3x_i2c_xfer_polling(struct i2c_adapter *adap, return rk3x_i2c_xfer_common(adap, msgs, num, true); } -static __maybe_unused int rk3x_i2c_resume(struct device *dev) +static int rk3x_i2c_resume(struct device *dev) { struct rk3x_i2c *i2c = dev_get_drvdata(dev); @@ -1394,7 +1394,7 @@ static void rk3x_i2c_remove(struct platform_device *pdev) clk_unprepare(i2c->clk); } -static SIMPLE_DEV_PM_OPS(rk3x_i2c_pm_ops, NULL, rk3x_i2c_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(rk3x_i2c_pm_ops, NULL, rk3x_i2c_resume); static struct platform_driver rk3x_i2c_driver = { .probe = rk3x_i2c_probe, @@ -1402,7 +1402,7 @@ static struct platform_driver rk3x_i2c_driver = { .driver = { .name = "rk3x-i2c", .of_match_table = rk3x_i2c_match, - .pm = &rk3x_i2c_pm_ops, + .pm = pm_sleep_ptr(&rk3x_i2c_pm_ops), }, }; -- 2.53.0