tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'acpi-bus'

* acpi-bus:
ACPI: Eliminate CONFIG_.*{, _MODULE} #ifdef in favor of IS_ENABLED()
ACPI: int340x_thermal: add missing CONFIG_ prefix

Rafael J. Wysocki 0f40314b 7dc1d36e

+12 -17
+4 -8
drivers/acpi/bus.c
··· 315 315 316 316 capbuf[OSC_QUERY_DWORD] = OSC_QUERY_ENABLE; 317 317 capbuf[OSC_SUPPORT_DWORD] = OSC_SB_PR3_SUPPORT; /* _PR3 is in use */ 318 - #if defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR) ||\ 319 - defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR_MODULE) 320 - capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PAD_SUPPORT; 321 - #endif 322 - 323 - #if defined(CONFIG_ACPI_PROCESSOR) || defined(CONFIG_ACPI_PROCESSOR_MODULE) 324 - capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PPC_OST_SUPPORT; 325 - #endif 318 + if (IS_ENABLED(CONFIG_ACPI_PROCESSOR_AGGREGATOR)) 319 + capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PAD_SUPPORT; 320 + if (IS_ENABLED(CONFIG_ACPI_PROCESSOR)) 321 + capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PPC_OST_SUPPORT; 326 322 327 323 capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_HOTPLUG_OST_SUPPORT; 328 324
+5 -6
drivers/acpi/int340x_thermal.c
··· 33 33 static int int340x_thermal_handler_attach(struct acpi_device *adev, 34 34 const struct acpi_device_id *id) 35 35 { 36 - #if defined(CONFIG_INT340X_THERMAL) || defined(CONFIG_INT340X_THERMAL_MODULE) 37 - acpi_create_platform_device(adev); 38 - #elif defined(INTEL_SOC_DTS_THERMAL) || defined(INTEL_SOC_DTS_THERMAL_MODULE) 39 - /* Intel SoC DTS thermal driver needs INT3401 to set IRQ descriptor */ 40 - if (id->driver_data == INT3401_DEVICE) 36 + if (IS_ENABLED(CONFIG_INT340X_THERMAL)) 41 37 acpi_create_platform_device(adev); 42 - #endif 38 + /* Intel SoC DTS thermal driver needs INT3401 to set IRQ descriptor */ 39 + else if (IS_ENABLED(CONFIG_INTEL_SOC_DTS_THERMAL) && 40 + id->driver_data == INT3401_DEVICE) 41 + acpi_create_platform_device(adev); 43 42 return 1; 44 43 } 45 44
+2 -2
include/acpi/button.h
··· 3 3 4 4 #include <linux/notifier.h> 5 5 6 - #if defined(CONFIG_ACPI_BUTTON) || defined(CONFIG_ACPI_BUTTON_MODULE) 6 + #if IS_ENABLED(CONFIG_ACPI_BUTTON) 7 7 extern int acpi_lid_notifier_register(struct notifier_block *nb); 8 8 extern int acpi_lid_notifier_unregister(struct notifier_block *nb); 9 9 extern int acpi_lid_open(void); ··· 20 20 { 21 21 return 1; 22 22 } 23 - #endif /* defined(CONFIG_ACPI_BUTTON) || defined(CONFIG_ACPI_BUTTON_MODULE) */ 23 + #endif /* IS_ENABLED(CONFIG_ACPI_BUTTON) */ 24 24 25 25 #endif /* ACPI_BUTTON_H */
+1 -1
include/acpi/video.h
··· 24 24 acpi_backlight_native, 25 25 }; 26 26 27 - #if (defined CONFIG_ACPI_VIDEO || defined CONFIG_ACPI_VIDEO_MODULE) 27 + #if IS_ENABLED(CONFIG_ACPI_VIDEO) 28 28 extern int acpi_video_register(void); 29 29 extern void acpi_video_unregister(void); 30 30 extern int acpi_video_get_edid(struct acpi_device *device, int type,