Johnny Hughes
2019-02-04 c1f36c28393a7bb126cbf436cd6a4077a5b5c313
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
From 0fe2601c5f132408da07b3e674d5932549375616 Mon Sep 17 00:00:00 2001
From: Khuong Dinh <khuong.dinh@amperecomputing.com>
Date: Fri, 9 Feb 2018 17:38:35 +0200
Subject: [PATCH 08/11] BACKPORT: ACPI / bus: Rename acpi_get_match_data() to
 acpi_device_get_match_data()
 
Do the renaming to be consistent with its sibling, i.e.
of_device_get_match_data().
 
No functional change.
 
This patch is required to support AHCI ALPM de-feature for Ampere Computing
eMAG SATA.
This patch is backported from:
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?h=next-20180913&id=29d5325a14ab49375476e3a6442ff40a008a8c9a
 
Change-Id: I1e4becb2b3aced73f30b77ec99b2882983639f50
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Khuong Dinh <khuong.dinh@amperecomputing.com>
---
 drivers/acpi/bus.c   | 4 ++--
 include/linux/acpi.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index b271eb1..da29c10 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -785,7 +785,7 @@ const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
 }
 EXPORT_SYMBOL_GPL(acpi_match_device);
 
-void *acpi_get_match_data(const struct device *dev)
+void *acpi_device_get_match_data(const struct device *dev)
 {
     const struct acpi_device_id *match;
 
@@ -795,7 +795,7 @@ void *acpi_get_match_data(const struct device *dev)
 
     return (void *)match->driver_data;
 }
-EXPORT_SYMBOL_GPL(acpi_get_match_data);
+EXPORT_SYMBOL_GPL(acpi_device_get_match_data);
 
 int acpi_match_device_ids(struct acpi_device *device,
               const struct acpi_device_id *ids)
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 42e1565..379619e 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -584,7 +584,7 @@ extern int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *),
 const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
                            const struct device *dev);
 
-void *acpi_get_match_data(const struct device *dev);
+void *acpi_device_get_match_data(const struct device *dev);
 extern bool acpi_driver_match_device(struct device *dev,
                      const struct device_driver *drv);
 int acpi_device_uevent_modalias(struct device *, struct kobj_uevent_env *);
@@ -756,7 +756,7 @@ static inline const struct acpi_device_id *acpi_match_device(
     return NULL;
 }
 
-static inline void *acpi_get_match_data(const struct device *dev)
+static inline void *acpi_device_get_match_data(const struct device *dev)
 {
     return NULL;
 }
-- 
1.8.3.1