From: Chris Packham <Chris.Packham@alliedtelesis.co.nz>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
"linux-i2c@vger.kernel.org" <linux-i2c@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Cc: "wsa@kernel.org" <wsa@kernel.org>
Subject: Re: [PATCH v1 2/4] i2c: mpc: Remove CONFIG_PM_SLEEP ifdeffery
Date: Tue, 13 Apr 2021 23:43:25 +0000 [thread overview]
Message-ID: <c6bae18f-a83f-675d-78a3-a4441b8c46f3@alliedtelesis.co.nz> (raw)
In-Reply-To: <20210413143756.60138-2-andriy.shevchenko@linux.intel.com>
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,
},
};
next prev parent reply other threads:[~2021-04-13 23:43 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-13 14:37 [PATCH v1 1/4] i2c: mpc: Use devm_clk_get_optional() Andy Shevchenko
2021-04-13 14:37 ` [PATCH v1 2/4] i2c: mpc: Remove CONFIG_PM_SLEEP ifdeffery Andy Shevchenko
2021-04-13 18:05 ` kernel test robot
2021-04-13 23:43 ` Chris Packham [this message]
2021-04-14 12:14 ` Andy Shevchenko
2021-04-14 21:17 ` Chris Packham
2021-04-13 14:37 ` [PATCH v1 3/4] i2c: mpc: Use device_get_match_data() helper Andy Shevchenko
2021-04-13 23:45 ` Chris Packham
2021-04-13 14:37 ` [PATCH v1 4/4] i2c: mpc: Drop duplicate message from devm_platform_ioremap_resource() Andy Shevchenko
2021-04-13 23:45 ` Chris Packham
2021-04-13 23:34 ` [PATCH v1 1/4] i2c: mpc: Use devm_clk_get_optional() Chris Packham
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c6bae18f-a83f-675d-78a3-a4441b8c46f3@alliedtelesis.co.nz \
--to=chris.packham@alliedtelesis.co.nz \
--cc=andriy.shevchenko@linux.intel.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wsa@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).