[PATCH] mfd: intel-lpss: fix compilation issue if PM_SLEEP is not set

[PATCH] mfd: intel-lpss: fix compilation issue if PM_SLEEP is not set

[Vladimir Zapolskiy]

If kernel build configuration has enabled CONFIG_PM and unset
CONFIG_PM_SLEEP, then intel-lpss-pci.c and intel-lpss-acpi.c can not
be compiled due to a missing INTEL_LPSS_SLEEP_PM_OPS macro
declaration:

  drivers/mfd/intel-lpss-pci.c:63:8: error: undefined identifier 'INTEL_LPSS_SLEEP_PM_OPS'
  drivers/mfd/intel-lpss-pci.c:63:58: error: ‘INTEL_LPSS_SLEEP_PM_OPS’ undeclared here (not in a function)

Fixes: d35dbf0dbaa7 ("mfd: Add support for Intel Sunrisepoint LPSS devices")
Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
---
 drivers/mfd/intel-lpss.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/mfd/intel-lpss.h b/drivers/mfd/intel-lpss.h
index 764dc0d..0dcea9e 100644
--- a/drivers/mfd/intel-lpss.h
+++ b/drivers/mfd/intel-lpss.h
@@ -44,6 +44,8 @@ int intel_lpss_resume(struct device *dev);
 	.thaw = intel_lpss_resume,		\
 	.poweroff = intel_lpss_suspend,		\
 	.restore = intel_lpss_resume,
+#else
+#define INTEL_LPSS_SLEEP_PM_OPS
 #endif
 
 #define INTEL_LPSS_RUNTIME_PM_OPS		\
-- 
2.5.0

Re: [PATCH] mfd: intel-lpss: fix compilation issue if PM_SLEEP is not set

[Vladimir Zapolskiy]

On 24.06.2016 03:11, Vladimir Zapolskiy wrote:
> If kernel build configuration has enabled CONFIG_PM and unset
> CONFIG_PM_SLEEP, then intel-lpss-pci.c and intel-lpss-acpi.c can not
> be compiled due to a missing INTEL_LPSS_SLEEP_PM_OPS macro
> declaration:
> 
>   drivers/mfd/intel-lpss-pci.c:63:8: error: undefined identifier 'INTEL_LPSS_SLEEP_PM_OPS'
>   drivers/mfd/intel-lpss-pci.c:63:58: error: ‘INTEL_LPSS_SLEEP_PM_OPS’ undeclared here (not in a function)
> 
> Fixes: d35dbf0dbaa7 ("mfd: Add support for Intel Sunrisepoint LPSS devices")

Oops, weird fixed commit id, it should be

Fixes: 4b45efe85263 ("mfd: Add support for Intel Sunrisepoint LPSS devices")

> Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
> ---
>  drivers/mfd/intel-lpss.h | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/mfd/intel-lpss.h b/drivers/mfd/intel-lpss.h
> index 764dc0d..0dcea9e 100644
> --- a/drivers/mfd/intel-lpss.h
> +++ b/drivers/mfd/intel-lpss.h
> @@ -44,6 +44,8 @@ int intel_lpss_resume(struct device *dev);
>  	.thaw = intel_lpss_resume,		\
>  	.poweroff = intel_lpss_suspend,		\
>  	.restore = intel_lpss_resume,
> +#else
> +#define INTEL_LPSS_SLEEP_PM_OPS
>  #endif
>  
>  #define INTEL_LPSS_RUNTIME_PM_OPS		\
> 

--
Best wishes,
Vladimir

Re: [PATCH] mfd: intel-lpss: fix compilation issue if PM_SLEEP is not set

[Andy Shevchenko]

On Fri, 2016-06-24 at 03:11 +0300, Vladimir Zapolskiy wrote:
> If kernel build configuration has enabled CONFIG_PM and unset
> CONFIG_PM_SLEEP, then intel-lpss-pci.c and intel-lpss-acpi.c can not
> be compiled due to a missing INTEL_LPSS_SLEEP_PM_OPS macro
> declaration:
> 
>   drivers/mfd/intel-lpss-pci.c:63:8: error: undefined identifier
> 'INTEL_LPSS_SLEEP_PM_OPS'
>   drivers/mfd/intel-lpss-pci.c:63:58: error: ‘INTEL_LPSS_SLEEP_PM_OPS’
> undeclared here (not in a function)

And may I ask what ancient kernel you are using?

commit 47b91923ea41288751e83a5b080576085a831333
Author: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Date:   Mon Sep 14 11:32:47 2015 +0300

    mfd: intel-lpss: Fix build error when !CONFIG_PM_SLEEP


> 
> Fixes: d35dbf0dbaa7 ("mfd: Add support for Intel Sunrisepoint LPSS
> devices")
> Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
> ---
>  drivers/mfd/intel-lpss.h | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/mfd/intel-lpss.h b/drivers/mfd/intel-lpss.h
> index 764dc0d..0dcea9e 100644
> --- a/drivers/mfd/intel-lpss.h
> +++ b/drivers/mfd/intel-lpss.h
> @@ -44,6 +44,8 @@ int intel_lpss_resume(struct device *dev);
>  	.thaw = intel_lpss_resume,		\
>  	.poweroff = intel_lpss_suspend,		\
>  	.restore = intel_lpss_resume,
> +#else
> +#define INTEL_LPSS_SLEEP_PM_OPS
>  #endif
>  
>  #define INTEL_LPSS_RUNTIME_PM_OPS		\

-- 

Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy

Re: [PATCH] mfd: intel-lpss: fix compilation issue if PM_SLEEP is not set

[Vladimir Zapolskiy]

On 24.06.2016 11:28, Andy Shevchenko wrote:
> On Fri, 2016-06-24 at 03:11 +0300, Vladimir Zapolskiy wrote:
>> If kernel build configuration has enabled CONFIG_PM and unset
>> CONFIG_PM_SLEEP, then intel-lpss-pci.c and intel-lpss-acpi.c can not
>> be compiled due to a missing INTEL_LPSS_SLEEP_PM_OPS macro
>> declaration:
>>
>>   drivers/mfd/intel-lpss-pci.c:63:8: error: undefined identifier
>> 'INTEL_LPSS_SLEEP_PM_OPS'
>>   drivers/mfd/intel-lpss-pci.c:63:58: error: ‘INTEL_LPSS_SLEEP_PM_OPS’
>> undeclared here (not in a function)
> 
> And may I ask what ancient kernel you are using?
> 
> commit 47b91923ea41288751e83a5b080576085a831333
> Author: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Date:   Mon Sep 14 11:32:47 2015 +0300
> 
>     mfd: intel-lpss: Fix build error when !CONFIG_PM_SLEEP

The original driver was backported to 4.1

Thanks for the reference to a fixup, I'll backport it as well.

Lee, please ignore this change.

--
With best wishes,
Vladimir