From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161297AbcFCMQa (ORCPT ); Fri, 3 Jun 2016 08:16:30 -0400 Received: from saturn.retrosnub.co.uk ([178.18.118.26]:32985 "EHLO saturn.retrosnub.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932601AbcFCMQ2 (ORCPT ); Fri, 3 Jun 2016 08:16:28 -0400 Subject: Re: [PATCH 2/8] iio: adc: ti_am335x_adc: use SIMPLE_DEV_PM_OPS helper macro To: "Andrew F. Davis" , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Dmitry Torokhov , Lee Jones , Dave Gerlach References: <20160531170013.2649-1-afd@ti.com> <20160531170013.2649-3-afd@ti.com> Cc: linux-iio@vger.kernel.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org From: Jonathan Cameron Message-ID: <803110b4-997e-d8d0-dc3e-1ff6279ad202@kernel.org> Date: Fri, 3 Jun 2016 13:16:25 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.1.0 MIME-Version: 1.0 In-Reply-To: <20160531170013.2649-3-afd@ti.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 31/05/16 18:00, Andrew F. Davis wrote: > Replace ifdefs with SIMPLE_DEV_PM_OPS helper macro. > > Signed-off-by: Andrew F. Davis Applied to the togreg branch of iio.git - initially pushed out as testing for the autobuilders to play with it. Thanks, Jonathan > --- > drivers/iio/adc/ti_am335x_adc.c | 16 ++++------------ > 1 file changed, 4 insertions(+), 12 deletions(-) > > diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c > index c1e0553..18af71d 100644 > --- a/drivers/iio/adc/ti_am335x_adc.c > +++ b/drivers/iio/adc/ti_am335x_adc.c > @@ -531,8 +531,7 @@ static int tiadc_remove(struct platform_device *pdev) > return 0; > } > > -#ifdef CONFIG_PM > -static int tiadc_suspend(struct device *dev) > +static int __maybe_unused tiadc_suspend(struct device *dev) > { > struct iio_dev *indio_dev = dev_get_drvdata(dev); > struct tiadc_device *adc_dev = iio_priv(indio_dev); > @@ -550,7 +549,7 @@ static int tiadc_suspend(struct device *dev) > return 0; > } > > -static int tiadc_resume(struct device *dev) > +static int __maybe_unused tiadc_resume(struct device *dev) > { > struct iio_dev *indio_dev = dev_get_drvdata(dev); > struct tiadc_device *adc_dev = iio_priv(indio_dev); > @@ -567,14 +566,7 @@ static int tiadc_resume(struct device *dev) > return 0; > } > > -static const struct dev_pm_ops tiadc_pm_ops = { > - .suspend = tiadc_suspend, > - .resume = tiadc_resume, > -}; > -#define TIADC_PM_OPS (&tiadc_pm_ops) > -#else > -#define TIADC_PM_OPS NULL > -#endif > +static SIMPLE_DEV_PM_OPS(tiadc_pm_ops, tiadc_suspend, tiadc_resume); > > static const struct of_device_id ti_adc_dt_ids[] = { > { .compatible = "ti,am3359-adc", }, > @@ -585,7 +577,7 @@ MODULE_DEVICE_TABLE(of, ti_adc_dt_ids); > static struct platform_driver tiadc_driver = { > .driver = { > .name = "TI-am335x-adc", > - .pm = TIADC_PM_OPS, > + .pm = &tiadc_pm_ops, > .of_match_table = ti_adc_dt_ids, > }, > .probe = tiadc_probe, >