diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2023-02-06 16:52:38 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2023-02-10 17:15:18 +0100 |
| commit | 67c7debbfc3b1ccfe18e10b7e7663737f7dff0e3 (patch) | |
| tree | f40bb489acc4aab9ae67f44fc2884d42685a42d5 /include/linux/platform_data | |
| parent | b919540aeb58bc164192b07e64fd45eea4f39b91 (diff) | |
platform/x86: Fix header inclusion in linux/platform_data/x86/soc.h
First of all, we don't use intel-family.h directly. On the other hand
we actively use boolean type, that is defined in the types.h (we take
top-level header for that) and x86_cpu_id, that is provided in the
mod_devicetable.h.
Secondly, we don't need to spread SOC_INTEL_IS_CPU() macro to the users.
Hence, undefine it when it's appropriate.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230206145238.19460-1-andriy.shevchenko@linux.intel.com
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/x86/soc.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/platform_data/x86/soc.h b/include/linux/platform_data/x86/soc.h index da05f425587a..a5705189e2ac 100644 --- a/include/linux/platform_data/x86/soc.h +++ b/include/linux/platform_data/x86/soc.h @@ -8,10 +8,13 @@ #ifndef __PLATFORM_DATA_X86_SOC_H #define __PLATFORM_DATA_X86_SOC_H +#include <linux/types.h> + #if IS_ENABLED(CONFIG_X86) +#include <linux/mod_devicetable.h> + #include <asm/cpu_device_id.h> -#include <asm/intel-family.h> #define SOC_INTEL_IS_CPU(soc, type) \ static inline bool soc_intel_is_##soc(void) \ @@ -34,6 +37,8 @@ SOC_INTEL_IS_CPU(apl, ATOM_GOLDMONT); SOC_INTEL_IS_CPU(glk, ATOM_GOLDMONT_PLUS); SOC_INTEL_IS_CPU(cml, KABYLAKE_L); +#undef SOC_INTEL_IS_CPU + #else /* IS_ENABLED(CONFIG_X86) */ static inline bool soc_intel_is_byt(void) |