[PATCH] iio kmx61 / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM

[PATCH] iio kmx61 / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM

[Daniel Baluta]

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 <daniel.baluta@intel.com>
---
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));
-- 
1.9.1

Re: [PATCH] iio kmx61 / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM

[Jonathan Cameron]

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 <daniel.baluta@intel.com>
Thanks Daniel, glad you tracked this down.  I was wondering why
the autobuilders were happy but it broke for Greg! (short memory
sometimes, given that patch was only a month ago).

Greg, as my tree is currently behind the point where Rafael did the big
patch series to fix this (and hence doesn't have the precursor patch)
there are two obvious solutions - either I rebase, or you take
this one patch directly as a merge fix.

Which would you prefer?

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));
> 

Re: [PATCH] iio kmx61 / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM

[Greg KH]

On Sat, Jan 10, 2015 at 10:32:59AM +0000, Jonathan Cameron wrote:
> 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 <daniel.baluta@intel.com>
> Thanks Daniel, glad you tracked this down.  I was wondering why
> the autobuilders were happy but it broke for Greg! (short memory
> sometimes, given that patch was only a month ago).
> 
> Greg, as my tree is currently behind the point where Rafael did the big
> patch series to fix this (and hence doesn't have the precursor patch)
> there are two obvious solutions - either I rebase, or you take
> this one patch directly as a merge fix.
> 
> Which would you prefer?

I can take this one on top of your tree if you ack it, that sould solve
the issue.

thanks,

greg k-h

Re: [PATCH] iio kmx61 / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM

[Jonathan Cameron]

On 10/01/15 17:30, Greg KH wrote:
> On Sat, Jan 10, 2015 at 10:32:59AM +0000, Jonathan Cameron wrote:
>> 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 <daniel.baluta@intel.com>
>> Thanks Daniel, glad you tracked this down.  I was wondering why
>> the autobuilders were happy but it broke for Greg! (short memory
>> sometimes, given that patch was only a month ago).
>>
>> Greg, as my tree is currently behind the point where Rafael did the big
>> patch series to fix this (and hence doesn't have the precursor patch)
>> there are two obvious solutions - either I rebase, or you take
>> this one patch directly as a merge fix.
>>
>> Which would you prefer?
> 
> I can take this one on top of your tree if you ack it, that sould solve
> the issue.
Cool - I acked a few days ago.  Hope that is fine.

Thanks,

Jonathan

> thanks,
> 
> greg k-h
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH] iio kmx61 / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM

[Jonathan Cameron]

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 <daniel.baluta@intel.com>
Acked-by: Jonathan Cameron <jic23@kernel.org>

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));
>