lkml.org 
[lkml]   [2018]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [RESEND PATCH] iio: dac: mcp4725: avoid using CONFIG_PM_SLEEP
On Sat, 11 Aug 2018 10:47:25 +0200
Marcus Folkesson <marcus.folkesson@gmail.com> wrote:

> This is already handled by SIMPLE_DEV_PM_OPS().
>
> Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
Applied to the togreg branch of iio.git and pushed out as testing for the
autobuilders to play with it.
> ---
> Somehow git-send-email messed up (?!) the format for (at least) gmail, so resend it.
> Mutt still read the mail correct though.

You have my sympathies ;) oh for all email servers and clients being well behaved.

Thanks,

Jonathan

>
> drivers/iio/dac/mcp4725.c | 12 +++---------
> 1 file changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/iio/dac/mcp4725.c b/drivers/iio/dac/mcp4725.c
> index 8b5aad4c32d9..6d71fd905e29 100644
> --- a/drivers/iio/dac/mcp4725.c
> +++ b/drivers/iio/dac/mcp4725.c
> @@ -45,7 +45,7 @@ struct mcp4725_data {
> struct regulator *vref_reg;
> };
>
> -static int mcp4725_suspend(struct device *dev)
> +static int __maybe_unused mcp4725_suspend(struct device *dev)
> {
> struct mcp4725_data *data = iio_priv(i2c_get_clientdata(
> to_i2c_client(dev)));
> @@ -58,7 +58,7 @@ static int mcp4725_suspend(struct device *dev)
> return i2c_master_send(data->client, outbuf, 2);
> }
>
> -static int mcp4725_resume(struct device *dev)
> +static int __maybe_unused mcp4725_resume(struct device *dev)
> {
> struct mcp4725_data *data = iio_priv(i2c_get_clientdata(
> to_i2c_client(dev)));
> @@ -71,13 +71,7 @@ static int mcp4725_resume(struct device *dev)
>
> return i2c_master_send(data->client, outbuf, 2);
> }
> -
> -#ifdef CONFIG_PM_SLEEP
> static SIMPLE_DEV_PM_OPS(mcp4725_pm_ops, mcp4725_suspend, mcp4725_resume);
> -#define MCP4725_PM_OPS (&mcp4725_pm_ops)
> -#else
> -#define MCP4725_PM_OPS NULL
> -#endif
>
> static ssize_t mcp4725_store_eeprom(struct device *dev,
> struct device_attribute *attr, const char *buf, size_t len)
> @@ -547,7 +541,7 @@ static struct i2c_driver mcp4725_driver = {
> .driver = {
> .name = MCP4725_DRV_NAME,
> .of_match_table = of_match_ptr(mcp4725_of_match),
> - .pm = MCP4725_PM_OPS,
> + .pm = &mcp4725_pm_ops,
> },
> .probe = mcp4725_probe,
> .remove = mcp4725_remove,

\
 
 \ /
  Last update: 2018-08-19 18:45    [W:0.045 / U:0.636 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site