| Message ID | 20170708000303.21863-1-dbasehore@chromium.org (mailing list archive) |
|---|---|
| State | Deferred, archived |
| Delegated to: | Andy Shevchenko |
| Headers | show |
On Sat, Jul 8, 2017 at 3:02 AM, Derek Basehore <dbasehore@chromium.org> wrote: > This creates an inline function of intel_pmc_slp_s0_counter_read for > !CONFIG_INTEL_PMC_CORE. it doesn't make sense alone. There is a plan to move this header to where it nowadays belongs to, i.e. include/linux/platform_data/x86/. Please, do this relocation first. > > Signed-off-by: Derek Basehore <dbasehore@chromium.org> > --- > arch/x86/include/asm/pmc_core.h | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/arch/x86/include/asm/pmc_core.h b/arch/x86/include/asm/pmc_core.h > index d4855f11136d..5d142d915f30 100644 > --- a/arch/x86/include/asm/pmc_core.h > +++ b/arch/x86/include/asm/pmc_core.h > @@ -22,6 +22,10 @@ > #define _ASM_PMC_CORE_H > > /* API to read SLP_S0_RESIDENCY counter */ > -int intel_pmc_slp_s0_counter_read(u32 *data); > +#ifdef CONFIG_INTEL_PMC_CORE > +extern int intel_pmc_slp_s0_counter_read(u32 *data); > +#else > +static inline int intel_pmc_slp_s0_counter_read(u32 *data) { return -EPERM; } > +#endif > > #endif /* _ASM_PMC_CORE_H */ > -- > 2.13.2.725.g09c95d1e9-goog >
diff --git a/arch/x86/include/asm/pmc_core.h b/arch/x86/include/asm/pmc_core.h index d4855f11136d..5d142d915f30 100644 --- a/arch/x86/include/asm/pmc_core.h +++ b/arch/x86/include/asm/pmc_core.h @@ -22,6 +22,10 @@ #define _ASM_PMC_CORE_H /* API to read SLP_S0_RESIDENCY counter */ -int intel_pmc_slp_s0_counter_read(u32 *data); +#ifdef CONFIG_INTEL_PMC_CORE +extern int intel_pmc_slp_s0_counter_read(u32 *data); +#else +static inline int intel_pmc_slp_s0_counter_read(u32 *data) { return -EPERM; } +#endif #endif /* _ASM_PMC_CORE_H */
This creates an inline function of intel_pmc_slp_s0_counter_read for !CONFIG_INTEL_PMC_CORE. Signed-off-by: Derek Basehore <dbasehore@chromium.org> --- arch/x86/include/asm/pmc_core.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)