| Message ID | 20240429040441.748479-1-sathyanarayanan.kuppuswamy@linux.intel.com |
|---|---|
| State | Accepted |
| Commit | dfac21b1eeefe8ae472e3fee511cfdcf7d03bb4b |
| Headers | show |
| Series | [v2] ACPI: Move acpi_blacklisted() declaration to asm/acpi.h | expand |
On Sun, Apr 28, 2024 at 09:04:41PM -0700, Kuppuswamy Sathyanarayanan wrote: > The function acpi_blacklisted() is defined only when CONFIG_X86 is > enabled and is only used by X86 arch code. To align with its usage and > definition conditions, move its declaration to asm/acpi.h FWIW, Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> ... > extern char acpi_video_backlight_string[]; > extern long acpi_is_video_device(acpi_handle handle); > -extern int acpi_blacklisted(void); I would replace it with a blank line (to me it seems the above and below are different groups from semantic point of view, but Rafael may correct me). > extern void acpi_osi_setup(char *str); > extern bool acpi_osi_is_win8(void);
On Mon, Apr 29, 2024 at 10:58 AM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > On Sun, Apr 28, 2024 at 09:04:41PM -0700, Kuppuswamy Sathyanarayanan wrote: > > The function acpi_blacklisted() is defined only when CONFIG_X86 is > > enabled and is only used by X86 arch code. To align with its usage and > > definition conditions, move its declaration to asm/acpi.h > > FWIW, > Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> I have replaced the v1 that was applied some time ago with this one. > ... > > > extern char acpi_video_backlight_string[]; > > extern long acpi_is_video_device(acpi_handle handle); > > -extern int acpi_blacklisted(void); > > I would replace it with a blank line (to me it seems the above and below are > different groups from semantic point of view, but Rafael may correct me). And I have added the blank line as suggested. > > extern void acpi_osi_setup(char *str); > > extern bool acpi_osi_is_win8(void); > > -- Thanks!
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h index f896eed4516c..5af926c050f0 100644 --- a/arch/x86/include/asm/acpi.h +++ b/arch/x86/include/asm/acpi.h @@ -56,6 +56,8 @@ static inline void disable_acpi(void) extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq); +extern int acpi_blacklisted(void); + static inline void acpi_noirq_set(void) { acpi_noirq = 1; } static inline void acpi_disable_pci(void) { diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 34829f2c517a..576e75b4529a 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -421,7 +421,6 @@ extern char *wmi_get_acpi_device_uid(const char *guid); extern char acpi_video_backlight_string[]; extern long acpi_is_video_device(acpi_handle handle); -extern int acpi_blacklisted(void); extern void acpi_osi_setup(char *str); extern bool acpi_osi_is_win8(void);
The function acpi_blacklisted() is defined only when CONFIG_X86 is enabled and is only used by X86 arch code. To align with its usage and definition conditions, move its declaration to asm/acpi.h Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com> --- Changes since v1: - v1 link: https://lore.kernel.org/lkml/ZhQS6uYmpsxFD3gn@smile.fi.intel.com/T/ - Changed the title to "ACPI: Move acpi_blacklisted() declaration to asm/acpi.h" - Removed the declaration from include/linux/acpi.h arch/x86/include/asm/acpi.h | 2 ++ include/linux/acpi.h | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)