[v1,2/4] i2c: mpc: Remove CONFIG_PM_SLEEP ifdeffery

Message ID 20210413143756.60138-2-andriy.shevchenko@linux.intel.com
State New
Headers show
Series
  • Untitled series #119638
Related show

Commit Message

Andy Shevchenko April 13, 2021, 2:37 p.m.
Use __maybe_unused for the suspend()/resume() hooks and get rid of
the CONFIG_PM_SLEEP ifdeffery to improve the code.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/i2c/busses/i2c-mpc.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

Comments

Chris Packham April 13, 2021, 11:43 p.m. | #1
On 14/04/21 2:37 am, Andy Shevchenko wrote:
> Use __maybe_unused for the suspend()/resume() hooks and get rid of

> the CONFIG_PM_SLEEP ifdeffery to improve the code.

>

> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

> ---

>   drivers/i2c/busses/i2c-mpc.c | 12 ++----------

>   1 file changed, 2 insertions(+), 10 deletions(-)

>

> diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c

> index 6dc029a31d36..2376accd4e8e 100644

> --- a/drivers/i2c/busses/i2c-mpc.c

> +++ b/drivers/i2c/busses/i2c-mpc.c

> @@ -66,9 +66,7 @@ struct mpc_i2c {

>   	struct i2c_adapter adap;

>   	int irq;

>   	u32 real_clk;

> -#ifdef CONFIG_PM_SLEEP

>   	u8 fdr, dfsrr;

> -#endif

>   	struct clk *clk_per;

>   };

This has a trivial conflict with my series because I'm also touching 
struct mpc_i2c. git am -3 seems to deal with it but would it be easier 
if I picked up these 4 changes and included them with my next submission?
> @@ -761,8 +759,7 @@ static int fsl_i2c_remove(struct platform_device *op)

>   	return 0;

>   };

>   

> -#ifdef CONFIG_PM_SLEEP

> -static int mpc_i2c_suspend(struct device *dev)

> +static int __maybe_unused mpc_i2c_suspend(struct device *dev)

>   {

>   	struct mpc_i2c *i2c = dev_get_drvdata(dev);

>   

> @@ -772,7 +769,7 @@ static int mpc_i2c_suspend(struct device *dev)

>   	return 0;

>   }

>   

> -static int mpc_i2c_resume(struct device *dev)

> +static int __maybe_unused mpc_i2c_resume(struct device *dev)

>   {

>   	struct mpc_i2c *i2c = dev_get_drvdata(dev);

>   

> @@ -781,12 +778,7 @@ static int mpc_i2c_resume(struct device *dev)

>   

>   	return 0;

>   }

> -

>   static SIMPLE_DEV_PM_OPS(mpc_i2c_pm_ops, mpc_i2c_suspend, mpc_i2c_resume);

> -#define MPC_I2C_PM_OPS	(&mpc_i2c_pm_ops)

> -#else

> -#define MPC_I2C_PM_OPS	NULL

> -#endif

>   

>   static const struct mpc_i2c_data mpc_i2c_data_512x = {

>   	.setup = mpc_i2c_setup_512x,


There's a reference to MPC_I2C_PM_OPS in mpc_i2c_driver which needs 
changing I think the following is needed

diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 1308f749dc75..7fde13472c09 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -862,7 +862,7 @@ static struct platform_driver mpc_i2c_driver = {
         .driver = {
                 .name = DRV_NAME,
                 .of_match_table = mpc_i2c_of_match,
-               .pm = MPC_I2C_PM_OPS,
+               .pm = &mpc_i2c_pm_ops,
         },
  };
Andy Shevchenko April 14, 2021, 12:14 p.m. | #2
On Tue, Apr 13, 2021 at 11:43:25PM +0000, Chris Packham wrote:
> On 14/04/21 2:37 am, Andy Shevchenko wrote:

> > Use __maybe_unused for the suspend()/resume() hooks and get rid of

> > the CONFIG_PM_SLEEP ifdeffery to improve the code.


> This has a trivial conflict with my series because I'm also touching 

> struct mpc_i2c. git am -3 seems to deal with it but would it be easier 

> if I picked up these 4 changes and included them with my next submission?


It would be ideal to me!

> > -#define MPC_I2C_PM_OPS	(&mpc_i2c_pm_ops)

> > -#else

> > -#define MPC_I2C_PM_OPS	NULL

> > -#endif

> >   

> >   static const struct mpc_i2c_data mpc_i2c_data_512x = {

> >   	.setup = mpc_i2c_setup_512x,

> 

> There's a reference to MPC_I2C_PM_OPS in mpc_i2c_driver which needs 

> changing I think the following is needed


True. sorry that my build test had been broken.
Tell me if you want v2 with this fixed or you may fold that change since the
above agreement.

> diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c

> index 1308f749dc75..7fde13472c09 100644

> --- a/drivers/i2c/busses/i2c-mpc.c

> +++ b/drivers/i2c/busses/i2c-mpc.c

> @@ -862,7 +862,7 @@ static struct platform_driver mpc_i2c_driver = {

>          .driver = {

>                  .name = DRV_NAME,

>                  .of_match_table = mpc_i2c_of_match,

> -               .pm = MPC_I2C_PM_OPS,

> +               .pm = &mpc_i2c_pm_ops,

>          },

>   };

> 

> 


-- 
With Best Regards,
Andy Shevchenko
Chris Packham April 14, 2021, 9:17 p.m. | #3
On 15/04/21 12:14 am, Andy Shevchenko wrote:
> On Tue, Apr 13, 2021 at 11:43:25PM +0000, Chris Packham wrote:

>> On 14/04/21 2:37 am, Andy Shevchenko wrote:

>>> Use __maybe_unused for the suspend()/resume() hooks and get rid of

>>> the CONFIG_PM_SLEEP ifdeffery to improve the code.

>> This has a trivial conflict with my series because I'm also touching

>> struct mpc_i2c. git am -3 seems to deal with it but would it be easier

>> if I picked up these 4 changes and included them with my next submission?

> It would be ideal to me!

OK I've picked them up.
>>> -#define MPC_I2C_PM_OPS	(&mpc_i2c_pm_ops)

>>> -#else

>>> -#define MPC_I2C_PM_OPS	NULL

>>> -#endif

>>>    

>>>    static const struct mpc_i2c_data mpc_i2c_data_512x = {

>>>    	.setup = mpc_i2c_setup_512x,

>> There's a reference to MPC_I2C_PM_OPS in mpc_i2c_driver which needs

>> changing I think the following is needed

> True. sorry that my build test had been broken.

> Tell me if you want v2 with this fixed or you may fold that change since the

> above agreement.

>

I can fold the fix below in. No need for a v2 from you.
>> diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c

>> index 1308f749dc75..7fde13472c09 100644

>> --- a/drivers/i2c/busses/i2c-mpc.c

>> +++ b/drivers/i2c/busses/i2c-mpc.c

>> @@ -862,7 +862,7 @@ static struct platform_driver mpc_i2c_driver = {

>>           .driver = {

>>                   .name = DRV_NAME,

>>                   .of_match_table = mpc_i2c_of_match,

>> -               .pm = MPC_I2C_PM_OPS,

>> +               .pm = &mpc_i2c_pm_ops,

>>           },

>>    };

>>

>>

Patch

diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 6dc029a31d36..2376accd4e8e 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -66,9 +66,7 @@  struct mpc_i2c {
 	struct i2c_adapter adap;
 	int irq;
 	u32 real_clk;
-#ifdef CONFIG_PM_SLEEP
 	u8 fdr, dfsrr;
-#endif
 	struct clk *clk_per;
 };
 
@@ -761,8 +759,7 @@  static int fsl_i2c_remove(struct platform_device *op)
 	return 0;
 };
 
-#ifdef CONFIG_PM_SLEEP
-static int mpc_i2c_suspend(struct device *dev)
+static int __maybe_unused mpc_i2c_suspend(struct device *dev)
 {
 	struct mpc_i2c *i2c = dev_get_drvdata(dev);
 
@@ -772,7 +769,7 @@  static int mpc_i2c_suspend(struct device *dev)
 	return 0;
 }
 
-static int mpc_i2c_resume(struct device *dev)
+static int __maybe_unused mpc_i2c_resume(struct device *dev)
 {
 	struct mpc_i2c *i2c = dev_get_drvdata(dev);
 
@@ -781,12 +778,7 @@  static int mpc_i2c_resume(struct device *dev)
 
 	return 0;
 }
-
 static SIMPLE_DEV_PM_OPS(mpc_i2c_pm_ops, mpc_i2c_suspend, mpc_i2c_resume);
-#define MPC_I2C_PM_OPS	(&mpc_i2c_pm_ops)
-#else
-#define MPC_I2C_PM_OPS	NULL
-#endif
 
 static const struct mpc_i2c_data mpc_i2c_data_512x = {
 	.setup = mpc_i2c_setup_512x,