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,3/6] ACPI / bus: Remove checks in acpi_get_match_data() From: Andy Shevchenko Message-Id: <20180201202012.36524-3-andriy.shevchenko@linux.intel.com> Date: Thu, 1 Feb 2018 22:20:09 +0200 To: dmaengine , "Rafael J . Wysocki" , linux-acpi@vger.kernel.org Cc: Andy Shevchenko , Sinan Kaya , Sakari Ailus , Vinod Koul List-ID: QXMgd2VsbCBhcyBpdHMgc2libGluZyBvZl9kZXZpY2VfZ2V0X21hdGNoX2RhdGEoKSBoYXMgbm8g c3VjaCBjaGVja3MsCm5vIG5lZWQgdG8gZG8gaXQgaW4gYWNwaV9nZXRfbWF0Y2hfZGF0YSgpLgoK Rmlyc3Qgb2YgYWxsLCB3ZSBhcmUgbm90IHN1cHBvc2VkIHRvIGNhbGwgZndub2RlIEFQSSBsaWtl IHRoaXMgd2l0aG91dApkcml2ZXIgYXR0YWNoZWQuCgpTZWNvbmQsIHNpbmNlIF9fYWNwaV9tYXRj aF9kZXZpY2UoKSBkb2VzIGNoZWNrIGlucHV0IHBhcmFtZXRlciB0aGVyZSBpcwpubyBuZWVkIHRv IGR1cGxpY2F0ZSBpdCBvdXRzaWRlLgoKRml4ZXM6IDgwMjEyYTE2MjMyOSAoIkFDUEkgLyBidXM6 IEludHJvZHVjZSBhY3BpX2dldF9tYXRjaF9kYXRhKCkgZnVuY3Rpb24iKQpDYzogU2luYW4gS2F5 YSA8b2theWFAY29kZWF1cm9yYS5vcmc+CkNjOiBTYWthcmkgQWlsdXMgPHNha2FyaS5haWx1c0Bs aW51eC5pbnRlbC5jb20+CkNjOiBWaW5vZCBLb3VsIDx2aW5vZC5rb3VsQGludGVsLmNvbT4KU2ln bmVkLW9mZi1ieTogQW5keSBTaGV2Y2hlbmtvIDxhbmRyaXkuc2hldmNoZW5rb0BsaW51eC5pbnRl bC5jb20+Ci0tLQp2MjogcmViYXNlIG9uIHRvcCBvZiBuZXcgcGF0Y2hlcywgcmVwaHJhc2UgY29t bWl0IG1lc3NhZ2UKIGRyaXZlcnMvYWNwaS9idXMuYyB8IDYgLS0tLS0tCiAxIGZpbGUgY2hhbmdl ZCwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2FjcGkvYnVzLmMgYi9kcml2 ZXJzL2FjcGkvYnVzLmMKaW5kZXggZjNhN2MyOWU5MTkwLi40MTNlNGIxY2IxYmUgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvYWNwaS9idXMuYworKysgYi9kcml2ZXJzL2FjcGkvYnVzLmMKQEAgLTc5MSwx MiArNzkxLDYgQEAgdm9pZCAqYWNwaV9nZXRfbWF0Y2hfZGF0YShjb25zdCBzdHJ1Y3QgZGV2aWNl ICpkZXYpCiB7CiAJY29uc3Qgc3RydWN0IGFjcGlfZGV2aWNlX2lkICptYXRjaDsKIAotCWlmICgh ZGV2LT5kcml2ZXIpCi0JCXJldHVybiBOVUxMOwotCi0JaWYgKCFkZXYtPmRyaXZlci0+YWNwaV9t YXRjaF90YWJsZSkKLQkJcmV0dXJuIE5VTEw7Ci0KIAltYXRjaCA9IGFjcGlfbWF0Y2hfZGV2aWNl KGRldi0+ZHJpdmVyLT5hY3BpX21hdGNoX3RhYmxlLCBkZXYpOwogCWlmICghbWF0Y2gpCiAJCXJl dHVybiBOVUxMOwo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Shevchenko Subject: [PATCH v2 3/6] ACPI / bus: Remove checks in acpi_get_match_data() Date: Thu, 1 Feb 2018 22:20:09 +0200 Message-ID: <20180201202012.36524-3-andriy.shevchenko@linux.intel.com> References: <20180201202012.36524-1-andriy.shevchenko@linux.intel.com> Return-path: Received: from mga17.intel.com ([192.55.52.151]:25365 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754703AbeBAUUT (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 As well as its sibling of_device_get_match_data() has no such checks, no need to do it in acpi_get_match_data(). First of all, we are not supposed to call fwnode API like this without driver attached. Second, since __acpi_match_device() does check input parameter there is no need to duplicate it outside. Fixes: 80212a162329 ("ACPI / bus: Introduce acpi_get_match_data() function") Cc: Sinan Kaya Cc: Sakari Ailus Cc: Vinod Koul Signed-off-by: Andy Shevchenko --- v2: rebase on top of new patches, rephrase commit message drivers/acpi/bus.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index f3a7c29e9190..413e4b1cb1be 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -791,12 +791,6 @@ void *acpi_get_match_data(const struct device *dev) { const struct acpi_device_id *match; - if (!dev->driver) - return NULL; - - if (!dev->driver->acpi_match_table) - return NULL; - match = acpi_match_device(dev->driver->acpi_match_table, dev); if (!match) return NULL; -- 2.15.1