Commit 29d5325a authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Rafael J. Wysocki

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.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 8ff277c5
...@@ -830,7 +830,7 @@ const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids, ...@@ -830,7 +830,7 @@ const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
} }
EXPORT_SYMBOL_GPL(acpi_match_device); 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; const struct acpi_device_id *match;
...@@ -840,7 +840,7 @@ void *acpi_get_match_data(const struct device *dev) ...@@ -840,7 +840,7 @@ void *acpi_get_match_data(const struct device *dev)
return (void *)match->driver_data; 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, int acpi_match_device_ids(struct acpi_device *device,
const struct acpi_device_id *ids) const struct acpi_device_id *ids)
......
...@@ -1275,7 +1275,7 @@ static void * ...@@ -1275,7 +1275,7 @@ static void *
acpi_fwnode_device_get_match_data(const struct fwnode_handle *fwnode, acpi_fwnode_device_get_match_data(const struct fwnode_handle *fwnode,
const struct device *dev) const struct device *dev)
{ {
return acpi_get_match_data(dev); return acpi_device_get_match_data(dev);
} }
#define DECLARE_ACPI_FWNODE_OPS(ops) \ #define DECLARE_ACPI_FWNODE_OPS(ops) \
......
...@@ -587,7 +587,7 @@ extern int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *), ...@@ -587,7 +587,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 acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
const struct device *dev); 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, extern bool acpi_driver_match_device(struct device *dev,
const struct device_driver *drv); const struct device_driver *drv);
int acpi_device_uevent_modalias(struct device *, struct kobj_uevent_env *); int acpi_device_uevent_modalias(struct device *, struct kobj_uevent_env *);
...@@ -766,7 +766,7 @@ static inline const struct acpi_device_id *acpi_match_device( ...@@ -766,7 +766,7 @@ static inline const struct acpi_device_id *acpi_match_device(
return NULL; 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; return NULL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment