From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967712AbaLLM3u (ORCPT ); Fri, 12 Dec 2014 07:29:50 -0500 Received: from saturn.retrosnub.co.uk ([178.18.118.26]:47679 "EHLO saturn.retrosnub.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967475AbaLLM3s (ORCPT ); Fri, 12 Dec 2014 07:29:48 -0500 Message-ID: <548ADFBA.6000303@kernel.org> Date: Fri, 12 Dec 2014 12:29:46 +0000 From: Jonathan Cameron User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: "Rafael J. Wysocki" , linux-iio@vger.kernel.org CC: Srinivas Pandruvada , Lars-Peter Clausen , Hartmut Knaack , Linux PM list , Linux Kernel Mailing List Subject: Re: [PATCH] iio / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM References: <202529361.GBbZ7zGgn8@vostro.rjw.lan> In-Reply-To: <202529361.GBbZ7zGgn8@vostro.rjw.lan> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03/12/14 02:06, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki > > 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/. > > Signed-off-by: Rafael J. Wysocki Acked-by: Jonathan Cameron > --- > > Note: This depends on commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if > PM_SLEEP is selected) which is only in linux-next at the moment (via the > linux-pm tree). > > Please let me know if it is OK to take this one into linux-pm. It is. If I took too long to reply and the dependency merged in the current window, I can take these through IIO if you'd prefer? Thanks, Jonathan > > --- > drivers/iio/accel/bmc150-accel.c | 4 ++-- > drivers/iio/accel/kxcjk-1013.c | 4 ++-- > drivers/iio/gyro/bmg160.c | 4 ++-- > 3 files changed, 6 insertions(+), 6 deletions(-) > > Index: linux-pm/drivers/iio/accel/bmc150-accel.c > =================================================================== > --- linux-pm.orig/drivers/iio/accel/bmc150-accel.c > +++ linux-pm/drivers/iio/accel/bmc150-accel.c > @@ -510,7 +510,7 @@ static int bmc150_accel_get_bw(struct bm > return -EINVAL; > } > > -#ifdef CONFIG_PM_RUNTIME > +#ifdef CONFIG_PM > static int bmc150_accel_get_startup_times(struct bmc150_accel_data *data) > { > int i; > @@ -1349,7 +1349,7 @@ static int bmc150_accel_resume(struct de > } > #endif > > -#ifdef CONFIG_PM_RUNTIME > +#ifdef CONFIG_PM > static int bmc150_accel_runtime_suspend(struct device *dev) > { > struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev)); > Index: linux-pm/drivers/iio/accel/kxcjk-1013.c > =================================================================== > --- linux-pm.orig/drivers/iio/accel/kxcjk-1013.c > +++ linux-pm/drivers/iio/accel/kxcjk-1013.c > @@ -358,7 +358,7 @@ static int kxcjk1013_chip_init(struct kx > return 0; > } > > -#ifdef CONFIG_PM_RUNTIME > +#ifdef CONFIG_PM > static int kxcjk1013_get_startup_times(struct kxcjk1013_data *data) > { > int i; > @@ -1357,7 +1357,7 @@ static int kxcjk1013_resume(struct devic > } > #endif > > -#ifdef CONFIG_PM_RUNTIME > +#ifdef CONFIG_PM > static int kxcjk1013_runtime_suspend(struct device *dev) > { > struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev)); > Index: linux-pm/drivers/iio/gyro/bmg160.c > =================================================================== > --- linux-pm.orig/drivers/iio/gyro/bmg160.c > +++ linux-pm/drivers/iio/gyro/bmg160.c > @@ -237,7 +237,7 @@ static int bmg160_chip_init(struct bmg16 > > static int bmg160_set_power_state(struct bmg160_data *data, bool on) > { > -#ifdef CONFIG_PM_RUNTIME > +#ifdef CONFIG_PM > int ret; > > if (on) > @@ -1164,7 +1164,7 @@ static int bmg160_resume(struct device * > } > #endif > > -#ifdef CONFIG_PM_RUNTIME > +#ifdef CONFIG_PM > static int bmg160_runtime_suspend(struct device *dev) > { > struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev)); >