Commit 0f40314b authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-bus' 

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

drivers/acpi/bus.c

+4 −8
Original line number Diff line number Diff line
@@ -315,14 +315,10 @@ static void acpi_bus_osc_support(void) 


	capbuf[OSC_QUERY_DWORD] = OSC_QUERY_ENABLE;

	capbuf[OSC_SUPPORT_DWORD] = OSC_SB_PR3_SUPPORT; /* _PR3 is in use */

#if defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR) ||\

			defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR_MODULE)

	if (IS_ENABLED(CONFIG_ACPI_PROCESSOR_AGGREGATOR))

		capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PAD_SUPPORT;

#endif



#if defined(CONFIG_ACPI_PROCESSOR) || defined(CONFIG_ACPI_PROCESSOR_MODULE)

	if (IS_ENABLED(CONFIG_ACPI_PROCESSOR))

		capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PPC_OST_SUPPORT;

#endif



	capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_HOTPLUG_OST_SUPPORT;

drivers/acpi/int340x_thermal.c

+4 −5
Original line number Diff line number Diff line
@@ -33,13 +33,12 @@ static const struct acpi_device_id int340x_thermal_device_ids[] = { 
static int int340x_thermal_handler_attach(struct acpi_device *adev,

					const struct acpi_device_id *id)

{

#if defined(CONFIG_INT340X_THERMAL) || defined(CONFIG_INT340X_THERMAL_MODULE)

	if (IS_ENABLED(CONFIG_INT340X_THERMAL))

		acpi_create_platform_device(adev);

#elif defined(INTEL_SOC_DTS_THERMAL) || defined(INTEL_SOC_DTS_THERMAL_MODULE)

	/* Intel SoC DTS thermal driver needs INT3401 to set IRQ descriptor */

	if (id->driver_data == INT3401_DEVICE)

	else if (IS_ENABLED(CONFIG_INTEL_SOC_DTS_THERMAL) &&

		 id->driver_data == INT3401_DEVICE)

		acpi_create_platform_device(adev);

#endif

	return 1;

}

include/acpi/button.h

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 


#include <linux/notifier.h>



#if defined(CONFIG_ACPI_BUTTON) || defined(CONFIG_ACPI_BUTTON_MODULE)

#if IS_ENABLED(CONFIG_ACPI_BUTTON)

extern int acpi_lid_notifier_register(struct notifier_block *nb);

extern int acpi_lid_notifier_unregister(struct notifier_block *nb);

extern int acpi_lid_open(void);
@@ -20,6 +20,6 @@ static inline int acpi_lid_open(void) 
{

	return 1;

}

#endif /* defined(CONFIG_ACPI_BUTTON) || defined(CONFIG_ACPI_BUTTON_MODULE) */

#endif /* IS_ENABLED(CONFIG_ACPI_BUTTON) */



#endif /* ACPI_BUTTON_H */

include/acpi/video.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ enum acpi_backlight_type { 
	acpi_backlight_native,

};



#if (defined CONFIG_ACPI_VIDEO || defined CONFIG_ACPI_VIDEO_MODULE)

#if IS_ENABLED(CONFIG_ACPI_VIDEO)

extern int acpi_video_register(void);

extern void acpi_video_unregister(void);

extern int acpi_video_get_edid(struct acpi_device *device, int type,