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
