linux-kernel - Re: [PATCH v1 2/4] i2c: mpc: Remove CONFIG_PM

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Wed, 14 Apr 2021 15:14:35 +0300
From:   Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
To:     Chris Packham <Chris.Packham@...iedtelesis.co.nz>
Cc:     "linux-i2c@...r.kernel.org" <linux-i2c@...r.kernel.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        "wsa@...nel.org" <wsa@...nel.org>
Subject: Re: [PATCH v1 2/4] i2c: mpc: Remove CONFIG_PM_SLEEP ifdeffery

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