The __maybe_unused attribute is preferred over CONFIG_PM
to prevent build time issues. This commit replaces CONFIG_PM
with this attribute.
Signed-off-by: Rishi Gupta <[email protected]>
---
drivers/pwm/pwm-pca9685.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/pwm/pwm-pca9685.c b/drivers/pwm/pwm-pca9685.c
index b07bdca..b2a9e77 100644
--- a/drivers/pwm/pwm-pca9685.c
+++ b/drivers/pwm/pwm-pca9685.c
@@ -512,8 +512,7 @@ static int pca9685_pwm_remove(struct i2c_client *client)
return 0;
}
-#ifdef CONFIG_PM
-static int pca9685_pwm_runtime_suspend(struct device *dev)
+static int __maybe_unused pca9685_pwm_runtime_suspend(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
struct pca9685 *pca = i2c_get_clientdata(client);
@@ -522,7 +521,7 @@ static int pca9685_pwm_runtime_suspend(struct device *dev)
return 0;
}
-static int pca9685_pwm_runtime_resume(struct device *dev)
+static int __maybe_unused pca9685_pwm_runtime_resume(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
struct pca9685 *pca = i2c_get_clientdata(client);
@@ -530,7 +529,6 @@ static int pca9685_pwm_runtime_resume(struct device *dev)
pca9685_set_sleep_mode(pca, false);
return 0;
}
-#endif
static const struct i2c_device_id pca9685_id[] = {
{ "pca9685", 0 },
--
2.7.4
On Wed, Mar 11, 2020 at 09:13:49PM +0530, Rishi Gupta wrote:
> The __maybe_unused attribute is preferred over CONFIG_PM
> to prevent build time issues. This commit replaces CONFIG_PM
> with this attribute.
I wasn't aware of build time issues and thought this was just about
#ifdef being ugly.
Anyhow, the change is fine,
Acked-by: Uwe Kleine-K?nig <[email protected]>
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | https://www.pengutronix.de/ |
These 2 links contains more details:
https://lore.kernel.org/patchwork/patch/732981
https://lkml.org/lkml/2019/1/17/437
On Wed, Mar 11, 2020 at 10:14 PM Uwe Kleine-König
<[email protected]> wrote:
>
> On Wed, Mar 11, 2020 at 09:13:49PM +0530, Rishi Gupta wrote:
> > The __maybe_unused attribute is preferred over CONFIG_PM
> > to prevent build time issues. This commit replaces CONFIG_PM
> > with this attribute.
>
> I wasn't aware of build time issues and thought this was just about
> #ifdef being ugly.
>
> Anyhow, the change is fine,
>
> Acked-by: Uwe Kleine-König <[email protected]>
>
>
> --
> Pengutronix e.K. | Uwe Kleine-König |
> Industrial Linux Solutions | https://www.pengutronix.de/ |
On Thu, Mar 12, 2020 at 01:16:28AM +0530, rishi gupta wrote:
> These 2 links contains more details:
> https://lore.kernel.org/patchwork/patch/732981
> https://lkml.org/lkml/2019/1/17/437
These are both about SIMPLE_DEV_PM_OPS which doesn't apply to
pwm-pca9685.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | https://www.pengutronix.de/ |
Tested again and found one gerrit was missing in my local build.
Both __maybe_unused and CONFIG_PM are working fine.
So it is your choice to apply or not apply this patch.
Regards,
Rishi
On Thu, Mar 12, 2020 at 1:25 AM Uwe Kleine-König
<[email protected]> wrote:
>
> On Thu, Mar 12, 2020 at 01:16:28AM +0530, rishi gupta wrote:
> > These 2 links contains more details:
> > https://lore.kernel.org/patchwork/patch/732981
> > https://lkml.org/lkml/2019/1/17/437
>
> These are both about SIMPLE_DEV_PM_OPS which doesn't apply to
> pwm-pca9685.
>
> Best regards
> Uwe
>
> --
> Pengutronix e.K. | Uwe Kleine-König |
> Industrial Linux Solutions | https://www.pengutronix.de/ |