Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb105d96 authored by Hans de Goede's avatar Hans de Goede Committed by Rafael J. Wysocki
Browse files

acpi-video-detect: Make acpi_video_get_capabilities a private function 



acpi_video_get_capabilities() is only used inside video_detect.c so make
it static. While at it also remove the prototype for the non existent
acpi_video_display_switch_support function from acpi.h

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarDarren Hart <dvhart@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 7f3b62cf

drivers/acpi/video_detect.c

+1 −2
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = { 
 * all graphics capabilities of physically present devices are

 * summarized and returned. This is cached and done only once.

 */

long acpi_video_get_capabilities(acpi_handle graphics_handle)

static long acpi_video_get_capabilities(acpi_handle graphics_handle)

{

	long caps = 0;

	struct acpi_device *tmp_dev;
@@ -227,7 +227,6 @@ long acpi_video_get_capabilities(acpi_handle graphics_handle) 
			  graphics_handle ? acpi_device_bid(tmp_dev) : ""));

	return caps;

}

EXPORT_SYMBOL(acpi_video_get_capabilities);



static void acpi_video_caps_check(void)

{

include/linux/acpi.h

+0 −12
Original line number Diff line number Diff line
@@ -245,19 +245,12 @@ extern bool wmi_has_guid(const char *guid); 


#if defined(CONFIG_ACPI_VIDEO) || defined(CONFIG_ACPI_VIDEO_MODULE)



extern long acpi_video_get_capabilities(acpi_handle graphics_dev_handle);

extern long acpi_is_video_device(acpi_handle handle);

extern void acpi_video_dmi_promote_vendor(void);

extern int acpi_video_backlight_support(void);

extern int acpi_video_display_switch_support(void);



#else



static inline long acpi_video_get_capabilities(acpi_handle graphics_dev_handle)

{

	return 0;

}



static inline long acpi_is_video_device(acpi_handle handle)

{

	return 0;
@@ -272,11 +265,6 @@ static inline int acpi_video_backlight_support(void) 
	return 0;

}



static inline int acpi_video_display_switch_support(void)

{

	return 0;

}



#endif /* defined(CONFIG_ACPI_VIDEO) || defined(CONFIG_ACPI_VIDEO_MODULE) */



extern int acpi_blacklisted(void);