From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v2,4/6] ACPI / bus: Rename acpi_get_match_data() to acpi_device_get_match_data() From: Andy Shevchenko Message-Id: <20180201202012.36524-4-andriy.shevchenko@linux.intel.com> Date: Thu, 1 Feb 2018 22:20:10 +0200 To: dmaengine , "Rafael J . Wysocki" , linux-acpi@vger.kernel.org Cc: Andy Shevchenko , Sinan Kaya , Sakari Ailus , Vinod Koul List-ID: RG8gdGhlIHJlbmFtaW5nIHRvIGJlIGNvbnNpc3RlbnQgd2l0aCBpdHMgc2libGluZywgaS5lLgpv Zl9kZXZpY2VfZ2V0X21hdGNoX2RhdGEoKS4KCk5vIGZ1bmN0aW9uYWwgY2hhbmdlLgoKRml4ZXM6 IDgwMjEyYTE2MjMyOSAoIkFDUEkgLyBidXM6IEludHJvZHVjZSBhY3BpX2dldF9tYXRjaF9kYXRh KCkgZnVuY3Rpb24iKQpGaXhlczogMTQ2YjRkYmIwZWVmICgiQUNQSTogcHJvcGVydGllczogSW1w bGVtZW50IGdldF9tYXRjaF9kYXRhKCkgY2FsbGJhY2siKQpDYzogU2luYW4gS2F5YSA8b2theWFA Y29kZWF1cm9yYS5vcmc+CkNjOiBTYWthcmkgQWlsdXMgPHNha2FyaS5haWx1c0BsaW51eC5pbnRl bC5jb20+CkNjOiBWaW5vZCBLb3VsIDx2aW5vZC5rb3VsQGludGVsLmNvbT4KU2lnbmVkLW9mZi1i eTogQW5keSBTaGV2Y2hlbmtvIDxhbmRyaXkuc2hldmNoZW5rb0BsaW51eC5pbnRlbC5jb20+Ci0t LQogZHJpdmVycy9hY3BpL2J1cy5jICAgICAgfCA0ICsrLS0KIGRyaXZlcnMvYWNwaS9wcm9wZXJ0 eS5jIHwgMiArLQogaW5jbHVkZS9saW51eC9hY3BpLmggICAgfCA0ICsrLS0KIDMgZmlsZXMgY2hh bmdlZCwgNSBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvYWNwaS9idXMuYyBiL2RyaXZlcnMvYWNwaS9idXMuYwppbmRleCA0MTNlNGIxY2IxYmUuLjBm M2YzOGE0ZTBjNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9hY3BpL2J1cy5jCisrKyBiL2RyaXZlcnMv YWNwaS9idXMuYwpAQCAtNzg3LDcgKzc4Nyw3IEBAIGNvbnN0IHN0cnVjdCBhY3BpX2RldmljZV9p ZCAqYWNwaV9tYXRjaF9kZXZpY2UoY29uc3Qgc3RydWN0IGFjcGlfZGV2aWNlX2lkICppZHMsCiB9 CiBFWFBPUlRfU1lNQk9MX0dQTChhY3BpX21hdGNoX2RldmljZSk7CiAKLXZvaWQgKmFjcGlfZ2V0 X21hdGNoX2RhdGEoY29uc3Qgc3RydWN0IGRldmljZSAqZGV2KQordm9pZCAqYWNwaV9kZXZpY2Vf Z2V0X21hdGNoX2RhdGEoY29uc3Qgc3RydWN0IGRldmljZSAqZGV2KQogewogCWNvbnN0IHN0cnVj dCBhY3BpX2RldmljZV9pZCAqbWF0Y2g7CiAKQEAgLTc5Nyw3ICs3OTcsNyBAQCB2b2lkICphY3Bp X2dldF9tYXRjaF9kYXRhKGNvbnN0IHN0cnVjdCBkZXZpY2UgKmRldikKIAogCXJldHVybiAodm9p ZCAqKW1hdGNoLT5kcml2ZXJfZGF0YTsKIH0KLUVYUE9SVF9TWU1CT0xfR1BMKGFjcGlfZ2V0X21h dGNoX2RhdGEpOworRVhQT1JUX1NZTUJPTF9HUEwoYWNwaV9kZXZpY2VfZ2V0X21hdGNoX2RhdGEp OwogCiBpbnQgYWNwaV9tYXRjaF9kZXZpY2VfaWRzKHN0cnVjdCBhY3BpX2RldmljZSAqZGV2aWNl LAogCQkJICBjb25zdCBzdHJ1Y3QgYWNwaV9kZXZpY2VfaWQgKmlkcykKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvYWNwaS9wcm9wZXJ0eS5jIGIvZHJpdmVycy9hY3BpL3Byb3BlcnR5LmMKaW5kZXggNDY2 ZDE1MDNhYmEwLi5mOWI1ZmEyMzBhODYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvYWNwaS9wcm9wZXJ0 eS5jCisrKyBiL2RyaXZlcnMvYWNwaS9wcm9wZXJ0eS5jCkBAIC0xMjc1LDcgKzEyNzUsNyBAQCBz dGF0aWMgdm9pZCAqCiBhY3BpX2Z3bm9kZV9kZXZpY2VfZ2V0X21hdGNoX2RhdGEoY29uc3Qgc3Ry dWN0IGZ3bm9kZV9oYW5kbGUgKmZ3bm9kZSwKIAkJCQkgIGNvbnN0IHN0cnVjdCBkZXZpY2UgKmRl dikKIHsKLQlyZXR1cm4gYWNwaV9nZXRfbWF0Y2hfZGF0YShkZXYpOworCXJldHVybiBhY3BpX2Rl dmljZV9nZXRfbWF0Y2hfZGF0YShkZXYpOwogfQogCiAjZGVmaW5lIERFQ0xBUkVfQUNQSV9GV05P REVfT1BTKG9wcykgXApkaWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51eC9hY3BpLmggYi9pbmNsdWRl L2xpbnV4L2FjcGkuaAppbmRleCAyNDY4NDVkYTNmODQuLmQwY2JiYmQ4OGUwZSAxMDA2NDQKLS0t IGEvaW5jbHVkZS9saW51eC9hY3BpLmgKKysrIGIvaW5jbHVkZS9saW51eC9hY3BpLmgKQEAgLTU4 Nyw3ICs1ODcsNyBAQCBleHRlcm4gaW50IGFjcGlfbnZzX2Zvcl9lYWNoX3JlZ2lvbihpbnQgKCpm dW5jKShfX3U2NCwgX191NjQsIHZvaWQgKiksCiBjb25zdCBzdHJ1Y3QgYWNwaV9kZXZpY2VfaWQg KmFjcGlfbWF0Y2hfZGV2aWNlKGNvbnN0IHN0cnVjdCBhY3BpX2RldmljZV9pZCAqaWRzLAogCQkJ CQkgICAgICAgY29uc3Qgc3RydWN0IGRldmljZSAqZGV2KTsKIAotdm9pZCAqYWNwaV9nZXRfbWF0 Y2hfZGF0YShjb25zdCBzdHJ1Y3QgZGV2aWNlICpkZXYpOwordm9pZCAqYWNwaV9kZXZpY2VfZ2V0 X21hdGNoX2RhdGEoY29uc3Qgc3RydWN0IGRldmljZSAqZGV2KTsKIGV4dGVybiBib29sIGFjcGlf ZHJpdmVyX21hdGNoX2RldmljZShzdHJ1Y3QgZGV2aWNlICpkZXYsCiAJCQkJICAgICBjb25zdCBz dHJ1Y3QgZGV2aWNlX2RyaXZlciAqZHJ2KTsKIGludCBhY3BpX2RldmljZV91ZXZlbnRfbW9kYWxp YXMoc3RydWN0IGRldmljZSAqLCBzdHJ1Y3Qga29ial91ZXZlbnRfZW52ICopOwpAQCAtNzY2LDcg Kzc2Niw3IEBAIHN0YXRpYyBpbmxpbmUgY29uc3Qgc3RydWN0IGFjcGlfZGV2aWNlX2lkICphY3Bp X21hdGNoX2RldmljZSgKIAlyZXR1cm4gTlVMTDsKIH0KIAotc3RhdGljIGlubGluZSB2b2lkICph Y3BpX2dldF9tYXRjaF9kYXRhKGNvbnN0IHN0cnVjdCBkZXZpY2UgKmRldikKK3N0YXRpYyBpbmxp bmUgdm9pZCAqYWNwaV9kZXZpY2VfZ2V0X21hdGNoX2RhdGEoY29uc3Qgc3RydWN0IGRldmljZSAq ZGV2KQogewogCXJldHVybiBOVUxMOwogfQo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Shevchenko Subject: [PATCH v2 4/6] ACPI / bus: Rename acpi_get_match_data() to acpi_device_get_match_data() Date: Thu, 1 Feb 2018 22:20:10 +0200 Message-ID: <20180201202012.36524-4-andriy.shevchenko@linux.intel.com> References: <20180201202012.36524-1-andriy.shevchenko@linux.intel.com> Return-path: Received: from mga03.intel.com ([134.134.136.65]:38092 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754900AbeBAUUT (ORCPT ); Thu, 1 Feb 2018 15:20:19 -0500 In-Reply-To: <20180201202012.36524-1-andriy.shevchenko@linux.intel.com> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: dmaengine , "Rafael J . Wysocki" , linux-acpi@vger.kernel.org Cc: Andy Shevchenko , Sinan Kaya , Sakari Ailus , Vinod Koul Do the renaming to be consistent with its sibling, i.e. of_device_get_match_data(). No functional change. Fixes: 80212a162329 ("ACPI / bus: Introduce acpi_get_match_data() function") Fixes: 146b4dbb0eef ("ACPI: properties: Implement get_match_data() callback") Cc: Sinan Kaya Cc: Sakari Ailus Cc: Vinod Koul Signed-off-by: Andy Shevchenko --- drivers/acpi/bus.c | 4 ++-- drivers/acpi/property.c | 2 +- include/linux/acpi.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 413e4b1cb1be..0f3f38a4e0c5 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -787,7 +787,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; @@ -797,7 +797,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/drivers/acpi/property.c b/drivers/acpi/property.c index 466d1503aba0..f9b5fa230a86 100644 --- a/drivers/acpi/property.c +++ b/drivers/acpi/property.c @@ -1275,7 +1275,7 @@ static void * acpi_fwnode_device_get_match_data(const struct fwnode_handle *fwnode, const struct device *dev) { - return acpi_get_match_data(dev); + return acpi_device_get_match_data(dev); } #define DECLARE_ACPI_FWNODE_OPS(ops) \ diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 246845da3f84..d0cbbbd88e0e 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -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 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 *); @@ -766,7 +766,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; } -- 2.15.1