From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from saturn.retrosnub.co.uk ([178.18.118.26]:58728 "EHLO saturn.retrosnub.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751201AbbAJSLQ (ORCPT ); Sat, 10 Jan 2015 13:11:16 -0500 Message-ID: <54B16B41.2080806@kernel.org> Date: Sat, 10 Jan 2015 18:11:13 +0000 From: Jonathan Cameron MIME-Version: 1.0 To: Daniel Baluta , gregkh@linuxfoundation.org CC: linux-iio@vger.kernel.org, rafael.j.wysocki@intel.com Subject: Re: [PATCH] iio kmx61 / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM References: <1420796370-12158-1-git-send-email-daniel.baluta@intel.com> In-Reply-To: <1420796370-12158-1-git-send-email-daniel.baluta@intel.com> Content-Type: text/plain; charset=windows-1252 Sender: linux-iio-owner@vger.kernel.org List-Id: linux-iio@vger.kernel.org On 09/01/15 09:39, Daniel Baluta wrote: > After commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is > selected) PM_RUNTIME is always set if PM is set, so #ifdef blocks > depending on CONFIG_PM_RUNTIME may now be changed to depend on > CONFIG_PM. > > Replace CONFIG_PM_RUNTIME with CONFIG_PM everywhere under > drivers/iio/imu/kmx61.c > > Signed-off-by: Daniel Baluta Acked-by: Jonathan Cameron Thanks Daniel and thanks Greg. Should have thought to give a preemptive ack earlier! Jonathan > --- > This fixes build break when merging iio patches for 3.20 > into Greg's tree. > http://marc.info/?l=linux-iio&m=142077015029632&w=2 > > drivers/iio/imu/kmx61.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/iio/imu/kmx61.c b/drivers/iio/imu/kmx61.c > index 841b033..4e2605e 100644 > --- a/drivers/iio/imu/kmx61.c > +++ b/drivers/iio/imu/kmx61.c > @@ -735,7 +735,7 @@ static int kmx61_setup_any_motion_interrupt(struct kmx61_data *data, > */ > static int kmx61_set_power_state(struct kmx61_data *data, bool on, u8 device) > { > -#ifdef CONFIG_PM_RUNTIME > +#ifdef CONFIG_PM > int ret; > > if (device & KMX61_ACC) { > @@ -1523,7 +1523,7 @@ static int kmx61_resume(struct device *dev) > } > #endif > > -#ifdef CONFIG_PM_RUNTIME > +#ifdef CONFIG_PM > static int kmx61_runtime_suspend(struct device *dev) > { > struct kmx61_data *data = i2c_get_clientdata(to_i2c_client(dev)); >