aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/acpi/utils.c16
-rw-r--r--include/acpi/acpi_bus.h3
-rw-r--r--include/linux/acpi.h6
3 files changed, 0 insertions, 25 deletions
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 5a2bae2b6c3a..89363b245489 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -835,22 +835,6 @@ acpi_dev_get_first_match_dev(const char *hid, const char *uid, s64 hrv)
835} 835}
836EXPORT_SYMBOL(acpi_dev_get_first_match_dev); 836EXPORT_SYMBOL(acpi_dev_get_first_match_dev);
837 837
838/* DEPRECATED, use acpi_dev_get_first_match_dev() instead */
839const char *
840acpi_dev_get_first_match_name(const char *hid, const char *uid, s64 hrv)
841{
842 struct acpi_dev_match_info match = {};
843 struct device *dev;
844
845 strlcpy(match.hid[0].id, hid, sizeof(match.hid[0].id));
846 match.uid = uid;
847 match.hrv = hrv;
848
849 dev = bus_find_device(&acpi_bus_type, NULL, &match, acpi_dev_match_cb);
850 return dev ? match.dev_name : NULL;
851}
852EXPORT_SYMBOL(acpi_dev_get_first_match_name);
853
854/* 838/*
855 * acpi_backlight= handling, this is done here rather then in video_detect.c 839 * acpi_backlight= handling, this is done here rather then in video_detect.c
856 * because __setup cannot be used in modules. 840 * because __setup cannot be used in modules.
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 2063e9e2f384..f7981751ac77 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -94,9 +94,6 @@ bool acpi_dev_present(const char *hid, const char *uid, s64 hrv);
94struct acpi_device * 94struct acpi_device *
95acpi_dev_get_first_match_dev(const char *hid, const char *uid, s64 hrv); 95acpi_dev_get_first_match_dev(const char *hid, const char *uid, s64 hrv);
96 96
97const char *
98acpi_dev_get_first_match_name(const char *hid, const char *uid, s64 hrv);
99
100#ifdef CONFIG_ACPI 97#ifdef CONFIG_ACPI
101 98
102#include <linux/proc_fs.h> 99#include <linux/proc_fs.h>
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 3e1d16b00513..392413075cc0 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -675,12 +675,6 @@ acpi_dev_get_first_match_dev(const char *hid, const char *uid, s64 hrv)
675 return NULL; 675 return NULL;
676} 676}
677 677
678static inline const char *
679acpi_dev_get_first_match_name(const char *hid, const char *uid, s64 hrv)
680{
681 return NULL;
682}
683
684static inline bool is_acpi_node(struct fwnode_handle *fwnode) 678static inline bool is_acpi_node(struct fwnode_handle *fwnode)
685{ 679{
686 return false; 680 return false;