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,6/6] device property: Constify device_get_match_data() From: Andy Shevchenko Message-Id: <20180201202012.36524-6-andriy.shevchenko@linux.intel.com> Date: Thu, 1 Feb 2018 22:20:12 +0200 To: dmaengine , "Rafael J . Wysocki" , linux-acpi@vger.kernel.org Cc: Andy Shevchenko , Sinan Kaya , Sakari Ailus , Vinod Koul List-ID: Q29uc3RpZnkgZGV2aWNlX2dldF9tYXRjaF9kYXRhKCkgYXMgT0YgYW5kIEFDUEkgdmFyaWFudHMg cmV0dXJuCmNvbnN0YW50IHZhbHVlLgoKRml4ZXM6IDgwMjEyYTE2MjMyOSAoIkFDUEkgLyBidXM6 IEludHJvZHVjZSBhY3BpX2dldF9tYXRjaF9kYXRhKCkgZnVuY3Rpb24iKQpGaXhlczogYjI4M2Yx NTc2MTFmICgiZGV2aWNlIHByb3BlcnR5OiBJbnRyb2R1Y2UgYSBjb21tb24gQVBJIHRvIGZldGNo IGRldmljZSBtYXRjaCBkYXRhIikKRml4ZXM6IDE0NmI0ZGJiMGVlZiAoIkFDUEk6IHByb3BlcnRp ZXM6IEltcGxlbWVudCBnZXRfbWF0Y2hfZGF0YSgpIGNhbGxiYWNrIikKQ2M6IFNpbmFuIEtheWEg PG9rYXlhQGNvZGVhdXJvcmEub3JnPgpDYzogU2FrYXJpIEFpbHVzIDxzYWthcmkuYWlsdXNAbGlu dXguaW50ZWwuY29tPgpDYzogVmlub2QgS291bCA8dmlub2Qua291bEBpbnRlbC5jb20+ClNpZ25l ZC1vZmYtYnk6IEFuZHkgU2hldmNoZW5rbyA8YW5kcml5LnNoZXZjaGVua29AbGludXguaW50ZWwu Y29tPgotLS0KIGRyaXZlcnMvYWNwaS9idXMuYyAgICAgICB8IDQgKystLQogZHJpdmVycy9hY3Bp L3Byb3BlcnR5LmMgIHwgMiArLQogZHJpdmVycy9iYXNlL3Byb3BlcnR5LmMgIHwgNSArKy0tLQog ZHJpdmVycy9vZi9wcm9wZXJ0eS5jICAgIHwgNCArKy0tCiBpbmNsdWRlL2xpbnV4L2FjcGkuaCAg ICAgfCA0ICsrLS0KIGluY2x1ZGUvbGludXgvZndub2RlLmggICB8IDQgKystLQogaW5jbHVkZS9s aW51eC9wcm9wZXJ0eS5oIHwgMiArLQogNyBmaWxlcyBjaGFuZ2VkLCAxMiBpbnNlcnRpb25zKCsp LCAxMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2FjcGkvYnVzLmMgYi9kcml2 ZXJzL2FjcGkvYnVzLmMKaW5kZXggMGYzZjM4YTRlMGM1Li4zMWYxZjc5ZmIzYzMgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvYWNwaS9idXMuYworKysgYi9kcml2ZXJzL2FjcGkvYnVzLmMKQEAgLTc4Nyw3 ICs3ODcsNyBAQCBjb25zdCBzdHJ1Y3QgYWNwaV9kZXZpY2VfaWQgKmFjcGlfbWF0Y2hfZGV2aWNl KGNvbnN0IHN0cnVjdCBhY3BpX2RldmljZV9pZCAqaWRzLAogfQogRVhQT1JUX1NZTUJPTF9HUEwo YWNwaV9tYXRjaF9kZXZpY2UpOwogCi12b2lkICphY3BpX2RldmljZV9nZXRfbWF0Y2hfZGF0YShj b25zdCBzdHJ1Y3QgZGV2aWNlICpkZXYpCitjb25zdCB2b2lkICphY3BpX2RldmljZV9nZXRfbWF0 Y2hfZGF0YShjb25zdCBzdHJ1Y3QgZGV2aWNlICpkZXYpCiB7CiAJY29uc3Qgc3RydWN0IGFjcGlf ZGV2aWNlX2lkICptYXRjaDsKIApAQCAtNzk1LDcgKzc5NSw3IEBAIHZvaWQgKmFjcGlfZGV2aWNl X2dldF9tYXRjaF9kYXRhKGNvbnN0IHN0cnVjdCBkZXZpY2UgKmRldikKIAlpZiAoIW1hdGNoKQog CQlyZXR1cm4gTlVMTDsKIAotCXJldHVybiAodm9pZCAqKW1hdGNoLT5kcml2ZXJfZGF0YTsKKwly ZXR1cm4gKGNvbnN0IHZvaWQgKiltYXRjaC0+ZHJpdmVyX2RhdGE7CiB9CiBFWFBPUlRfU1lNQk9M X0dQTChhY3BpX2RldmljZV9nZXRfbWF0Y2hfZGF0YSk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMv YWNwaS9wcm9wZXJ0eS5jIGIvZHJpdmVycy9hY3BpL3Byb3BlcnR5LmMKaW5kZXggZjliNWZhMjMw YTg2Li41ODE1MzU2ZWE2YWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvYWNwaS9wcm9wZXJ0eS5jCisr KyBiL2RyaXZlcnMvYWNwaS9wcm9wZXJ0eS5jCkBAIC0xMjcxLDcgKzEyNzEsNyBAQCBzdGF0aWMg aW50IGFjcGlfZndub2RlX2dyYXBoX3BhcnNlX2VuZHBvaW50KGNvbnN0IHN0cnVjdCBmd25vZGVf aGFuZGxlICpmd25vZGUsCiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyB2b2lkICoKK3N0YXRpYyBj b25zdCB2b2lkICoKIGFjcGlfZndub2RlX2RldmljZV9nZXRfbWF0Y2hfZGF0YShjb25zdCBzdHJ1 Y3QgZndub2RlX2hhbmRsZSAqZndub2RlLAogCQkJCSAgY29uc3Qgc3RydWN0IGRldmljZSAqZGV2 KQogewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9iYXNlL3Byb3BlcnR5LmMgYi9kcml2ZXJzL2Jhc2Uv cHJvcGVydHkuYwppbmRleCAzMDIyMzYyODFkODMuLjhmMjA1ZjY0NjFlZCAxMDA2NDQKLS0tIGEv ZHJpdmVycy9iYXNlL3Byb3BlcnR5LmMKKysrIGIvZHJpdmVycy9iYXNlL3Byb3BlcnR5LmMKQEAg LTE0MTAsOSArMTQxMCw4IEBAIGludCBmd25vZGVfZ3JhcGhfcGFyc2VfZW5kcG9pbnQoY29uc3Qg c3RydWN0IGZ3bm9kZV9oYW5kbGUgKmZ3bm9kZSwKIH0KIEVYUE9SVF9TWU1CT0woZndub2RlX2dy YXBoX3BhcnNlX2VuZHBvaW50KTsKIAotdm9pZCAqZGV2aWNlX2dldF9tYXRjaF9kYXRhKHN0cnVj dCBkZXZpY2UgKmRldikKK2NvbnN0IHZvaWQgKmRldmljZV9nZXRfbWF0Y2hfZGF0YShzdHJ1Y3Qg ZGV2aWNlICpkZXYpCiB7Ci0JcmV0dXJuIGZ3bm9kZV9jYWxsX3B0cl9vcChkZXZfZndub2RlKGRl diksIGRldmljZV9nZXRfbWF0Y2hfZGF0YSwKLQkJCQkgIGRldik7CisJcmV0dXJuIGZ3bm9kZV9j YWxsX3B0cl9vcChkZXZfZndub2RlKGRldiksIGRldmljZV9nZXRfbWF0Y2hfZGF0YSwgZGV2KTsK IH0KIEVYUE9SVF9TWU1CT0xfR1BMKGRldmljZV9nZXRfbWF0Y2hfZGF0YSk7CmRpZmYgLS1naXQg YS9kcml2ZXJzL29mL3Byb3BlcnR5LmMgYi9kcml2ZXJzL29mL3Byb3BlcnR5LmMKaW5kZXggMzZl ZDg0ZTI2ZDljLi5mNDY4MjhlM2IwODIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvb2YvcHJvcGVydHku YworKysgYi9kcml2ZXJzL29mL3Byb3BlcnR5LmMKQEAgLTk3NywxMSArOTc3LDExIEBAIHN0YXRp YyBpbnQgb2ZfZndub2RlX2dyYXBoX3BhcnNlX2VuZHBvaW50KGNvbnN0IHN0cnVjdCBmd25vZGVf aGFuZGxlICpmd25vZGUsCiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyB2b2lkICoKK3N0YXRpYyBj b25zdCB2b2lkICoKIG9mX2Z3bm9kZV9kZXZpY2VfZ2V0X21hdGNoX2RhdGEoY29uc3Qgc3RydWN0 IGZ3bm9kZV9oYW5kbGUgKmZ3bm9kZSwKIAkJCQljb25zdCBzdHJ1Y3QgZGV2aWNlICpkZXYpCiB7 Ci0JcmV0dXJuICh2b2lkICopb2ZfZGV2aWNlX2dldF9tYXRjaF9kYXRhKGRldik7CisJcmV0dXJu IG9mX2RldmljZV9nZXRfbWF0Y2hfZGF0YShkZXYpOwogfQogCiBjb25zdCBzdHJ1Y3QgZndub2Rl X29wZXJhdGlvbnMgb2ZfZndub2RlX29wcyA9IHsKZGlmZiAtLWdpdCBhL2luY2x1ZGUvbGludXgv YWNwaS5oIGIvaW5jbHVkZS9saW51eC9hY3BpLmgKaW5kZXggZDBjYmJiZDg4ZTBlLi45YTYxODIw NGFiYTQgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvbGludXgvYWNwaS5oCisrKyBiL2luY2x1ZGUvbGlu dXgvYWNwaS5oCkBAIC01ODcsNyArNTg3LDcgQEAgZXh0ZXJuIGludCBhY3BpX252c19mb3JfZWFj aF9yZWdpb24oaW50ICgqZnVuYykoX191NjQsIF9fdTY0LCB2b2lkICopLAogY29uc3Qgc3RydWN0 IGFjcGlfZGV2aWNlX2lkICphY3BpX21hdGNoX2RldmljZShjb25zdCBzdHJ1Y3QgYWNwaV9kZXZp Y2VfaWQgKmlkcywKIAkJCQkJICAgICAgIGNvbnN0IHN0cnVjdCBkZXZpY2UgKmRldik7CiAKLXZv aWQgKmFjcGlfZGV2aWNlX2dldF9tYXRjaF9kYXRhKGNvbnN0IHN0cnVjdCBkZXZpY2UgKmRldik7 Citjb25zdCB2b2lkICphY3BpX2RldmljZV9nZXRfbWF0Y2hfZGF0YShjb25zdCBzdHJ1Y3QgZGV2 aWNlICpkZXYpOwogZXh0ZXJuIGJvb2wgYWNwaV9kcml2ZXJfbWF0Y2hfZGV2aWNlKHN0cnVjdCBk ZXZpY2UgKmRldiwKIAkJCQkgICAgIGNvbnN0IHN0cnVjdCBkZXZpY2VfZHJpdmVyICpkcnYpOwog aW50IGFjcGlfZGV2aWNlX3VldmVudF9tb2RhbGlhcyhzdHJ1Y3QgZGV2aWNlICosIHN0cnVjdCBr b2JqX3VldmVudF9lbnYgKik7CkBAIC03NjYsNyArNzY2LDcgQEAgc3RhdGljIGlubGluZSBjb25z dCBzdHJ1Y3QgYWNwaV9kZXZpY2VfaWQgKmFjcGlfbWF0Y2hfZGV2aWNlKAogCXJldHVybiBOVUxM OwogfQogCi1zdGF0aWMgaW5saW5lIHZvaWQgKmFjcGlfZGV2aWNlX2dldF9tYXRjaF9kYXRhKGNv bnN0IHN0cnVjdCBkZXZpY2UgKmRldikKK3N0YXRpYyBpbmxpbmUgY29uc3Qgdm9pZCAqYWNwaV9k ZXZpY2VfZ2V0X21hdGNoX2RhdGEoY29uc3Qgc3RydWN0IGRldmljZSAqZGV2KQogewogCXJldHVy biBOVUxMOwogfQpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51eC9md25vZGUuaCBiL2luY2x1ZGUv bGludXgvZndub2RlLmgKaW5kZXggNGZhMWE0ODllZmU0Li40ZmU4ZjI4OWIzZjYgMTAwNjQ0Ci0t LSBhL2luY2x1ZGUvbGludXgvZndub2RlLmgKKysrIGIvaW5jbHVkZS9saW51eC9md25vZGUuaApA QCAtNzMsOCArNzMsOCBAQCBzdHJ1Y3QgZndub2RlX29wZXJhdGlvbnMgewogCXN0cnVjdCBmd25v ZGVfaGFuZGxlICooKmdldCkoc3RydWN0IGZ3bm9kZV9oYW5kbGUgKmZ3bm9kZSk7CiAJdm9pZCAo KnB1dCkoc3RydWN0IGZ3bm9kZV9oYW5kbGUgKmZ3bm9kZSk7CiAJYm9vbCAoKmRldmljZV9pc19h dmFpbGFibGUpKGNvbnN0IHN0cnVjdCBmd25vZGVfaGFuZGxlICpmd25vZGUpOwotCXZvaWQgKigq ZGV2aWNlX2dldF9tYXRjaF9kYXRhKShjb25zdCBzdHJ1Y3QgZndub2RlX2hhbmRsZSAqZndub2Rl LAotCQkJCSAgICAgICBjb25zdCBzdHJ1Y3QgZGV2aWNlICpkZXYpOworCWNvbnN0IHZvaWQgKigq ZGV2aWNlX2dldF9tYXRjaF9kYXRhKShjb25zdCBzdHJ1Y3QgZndub2RlX2hhbmRsZSAqZndub2Rl LAorCQkJCQkgICAgIGNvbnN0IHN0cnVjdCBkZXZpY2UgKmRldik7CiAJYm9vbCAoKnByb3BlcnR5 X3ByZXNlbnQpKGNvbnN0IHN0cnVjdCBmd25vZGVfaGFuZGxlICpmd25vZGUsCiAJCQkJIGNvbnN0 IGNoYXIgKnByb3BuYW1lKTsKIAlpbnQgKCpwcm9wZXJ0eV9yZWFkX2ludF9hcnJheSkoY29uc3Qg c3RydWN0IGZ3bm9kZV9oYW5kbGUgKmZ3bm9kZSwKZGlmZiAtLWdpdCBhL2luY2x1ZGUvbGludXgv cHJvcGVydHkuaCBiL2luY2x1ZGUvbGludXgvcHJvcGVydHkuaAppbmRleCA3NjlkMzcyYzFlZGYu LjJlZWE0YjMxMGZjMiAxMDA2NDQKLS0tIGEvaW5jbHVkZS9saW51eC9wcm9wZXJ0eS5oCisrKyBi L2luY2x1ZGUvbGludXgvcHJvcGVydHkuaApAQCAtMjgzLDcgKzI4Myw3IEBAIGJvb2wgZGV2aWNl X2RtYV9zdXBwb3J0ZWQoc3RydWN0IGRldmljZSAqZGV2KTsKIAogZW51bSBkZXZfZG1hX2F0dHIg ZGV2aWNlX2dldF9kbWFfYXR0cihzdHJ1Y3QgZGV2aWNlICpkZXYpOwogCi12b2lkICpkZXZpY2Vf Z2V0X21hdGNoX2RhdGEoc3RydWN0IGRldmljZSAqZGV2KTsKK2NvbnN0IHZvaWQgKmRldmljZV9n ZXRfbWF0Y2hfZGF0YShzdHJ1Y3QgZGV2aWNlICpkZXYpOwogCiBpbnQgZGV2aWNlX2dldF9waHlf bW9kZShzdHJ1Y3QgZGV2aWNlICpkZXYpOwogCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Shevchenko Subject: [PATCH v2 6/6] device property: Constify device_get_match_data() Date: Thu, 1 Feb 2018 22:20:12 +0200 Message-ID: <20180201202012.36524-6-andriy.shevchenko@linux.intel.com> References: <20180201202012.36524-1-andriy.shevchenko@linux.intel.com> Return-path: Received: from mga02.intel.com ([134.134.136.20]:62487 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754920AbeBAUUU (ORCPT ); Thu, 1 Feb 2018 15:20:20 -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 Constify device_get_match_data() as OF and ACPI variants return constant value. Fixes: 80212a162329 ("ACPI / bus: Introduce acpi_get_match_data() function") Fixes: b283f157611f ("device property: Introduce a common API to fetch device match data") 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 +- drivers/base/property.c | 5 ++--- drivers/of/property.c | 4 ++-- include/linux/acpi.h | 4 ++-- include/linux/fwnode.h | 4 ++-- include/linux/property.h | 2 +- 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 0f3f38a4e0c5..31f1f79fb3c3 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_device_get_match_data(const struct device *dev) +const void *acpi_device_get_match_data(const struct device *dev) { const struct acpi_device_id *match; @@ -795,7 +795,7 @@ void *acpi_device_get_match_data(const struct device *dev) if (!match) return NULL; - return (void *)match->driver_data; + return (const void *)match->driver_data; } EXPORT_SYMBOL_GPL(acpi_device_get_match_data); diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c index f9b5fa230a86..5815356ea6ad 100644 --- a/drivers/acpi/property.c +++ b/drivers/acpi/property.c @@ -1271,7 +1271,7 @@ static int acpi_fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode, return 0; } -static void * +static const void * acpi_fwnode_device_get_match_data(const struct fwnode_handle *fwnode, const struct device *dev) { diff --git a/drivers/base/property.c b/drivers/base/property.c index 302236281d83..8f205f6461ed 100644 --- a/drivers/base/property.c +++ b/drivers/base/property.c @@ -1410,9 +1410,8 @@ int fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode, } EXPORT_SYMBOL(fwnode_graph_parse_endpoint); -void *device_get_match_data(struct device *dev) +const void *device_get_match_data(struct device *dev) { - return fwnode_call_ptr_op(dev_fwnode(dev), device_get_match_data, - dev); + return fwnode_call_ptr_op(dev_fwnode(dev), device_get_match_data, dev); } EXPORT_SYMBOL_GPL(device_get_match_data); diff --git a/drivers/of/property.c b/drivers/of/property.c index 36ed84e26d9c..f46828e3b082 100644 --- a/drivers/of/property.c +++ b/drivers/of/property.c @@ -977,11 +977,11 @@ static int of_fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode, return 0; } -static void * +static const void * of_fwnode_device_get_match_data(const struct fwnode_handle *fwnode, const struct device *dev) { - return (void *)of_device_get_match_data(dev); + return of_device_get_match_data(dev); } const struct fwnode_operations of_fwnode_ops = { diff --git a/include/linux/acpi.h b/include/linux/acpi.h index d0cbbbd88e0e..9a618204aba4 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_device_get_match_data(const struct device *dev); +const 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_device_get_match_data(const struct device *dev) +static inline const void *acpi_device_get_match_data(const struct device *dev) { return NULL; } diff --git a/include/linux/fwnode.h b/include/linux/fwnode.h index 4fa1a489efe4..4fe8f289b3f6 100644 --- a/include/linux/fwnode.h +++ b/include/linux/fwnode.h @@ -73,8 +73,8 @@ struct fwnode_operations { struct fwnode_handle *(*get)(struct fwnode_handle *fwnode); void (*put)(struct fwnode_handle *fwnode); bool (*device_is_available)(const struct fwnode_handle *fwnode); - void *(*device_get_match_data)(const struct fwnode_handle *fwnode, - const struct device *dev); + const void *(*device_get_match_data)(const struct fwnode_handle *fwnode, + const struct device *dev); bool (*property_present)(const struct fwnode_handle *fwnode, const char *propname); int (*property_read_int_array)(const struct fwnode_handle *fwnode, diff --git a/include/linux/property.h b/include/linux/property.h index 769d372c1edf..2eea4b310fc2 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -283,7 +283,7 @@ bool device_dma_supported(struct device *dev); enum dev_dma_attr device_get_dma_attr(struct device *dev); -void *device_get_match_data(struct device *dev); +const void *device_get_match_data(struct device *dev); int device_get_phy_mode(struct device *dev); -- 2.15.1