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,1/6] ACPI / bus: Return error code from __acpi_match_device() in one case From: Andy Shevchenko Message-Id: <20180201202012.36524-1-andriy.shevchenko@linux.intel.com> Date: Thu, 1 Feb 2018 22:20:07 +0200 To: dmaengine , "Rafael J . Wysocki" , linux-acpi@vger.kernel.org Cc: Andy Shevchenko , Sinan Kaya , Sakari Ailus , Vinod Koul List-ID: SW5zdGVhZCBvZiBwbGF5aW5nIHRyaWNrcyB3aXRoIGxhc3QgaW52YWxpZCBlbnRyeSwKcmV0dXJu IHNpbXBsZSAtRU5PREFUQSBlcnJvciBjb2RlIGNhc3RlZCB0byBwb2ludGVyLgoKSXQgd291bGQg YmUgZ29vZCBmb3IgZnV0dXJlIGluIGNhc2UgY2FsbGVyIHBhc3NlcyBOVUxMIHBvaW50ZXIgZm9y CklEIHRhYmxlLiBNb3Jlb3ZlciwgY2FsbGVyIGNhbiBjaGVjayB0aGUgY29kZSB0byBiZSBzdXJl IHdoYXQgaGFwcGVuZWQKaW5zaWRlIGNhbGxlZS4KCkZpeGVzOiAyYjljNjk4ZWZhNTggKCJBQ1BJ IC8gc2NhbjogVGFrZSB0aGUgUFJQMDAwMSBwb3NpdGlvbiBpbiB0aGUgbGlzdCBvZiBJRHMgaW50 byBhY2NvdW50IikKQ2M6IFNpbmFuIEtheWEgPG9rYXlhQGNvZGVhdXJvcmEub3JnPgpDYzogU2Fr YXJpIEFpbHVzIDxzYWthcmkuYWlsdXNAbGludXguaW50ZWwuY29tPgpDYzogVmlub2QgS291bCA8 dmlub2Qua291bEBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEFuZHkgU2hldmNoZW5rbyA8YW5k cml5LnNoZXZjaGVua29AbGludXguaW50ZWwuY29tPgotLS0KdjI6IG5ldyBwYXRjaAogZHJpdmVy cy9hY3BpL2J1cy5jIHwgMiArLQogMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAxIGRl bGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9hY3BpL2J1cy5jIGIvZHJpdmVycy9hY3Bp L2J1cy5jCmluZGV4IGY4N2VkM2JlNzc5YS4uYTg3YTk3YmY3NWY4IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2FjcGkvYnVzLmMKKysrIGIvZHJpdmVycy9hY3BpL2J1cy5jCkBAIC03NjIsNyArNzYyLDcg QEAgc3RhdGljIGNvbnN0IHN0cnVjdCBhY3BpX2RldmljZV9pZCAqX19hY3BpX21hdGNoX2Rldmlj ZSgKIAkJICovCiAJCWlmICghc3RyY21wKEFDUElfRFRfTkFNRVNQQUNFX0hJRCwgaHdpZC0+aWQp CiAJCSAgICAmJiBhY3BpX29mX21hdGNoX2RldmljZShkZXZpY2UsIG9mX2lkcykpCi0JCQlyZXR1 cm4gaWQ7CisJCQlyZXR1cm4gRVJSX1BUUigtRU5PREFUQSk7CiAJfQogCXJldHVybiBOVUxMOwog fQo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Shevchenko Subject: [PATCH v2 1/6] ACPI / bus: Return error code from __acpi_match_device() in one case Date: Thu, 1 Feb 2018 22:20:07 +0200 Message-ID: <20180201202012.36524-1-andriy.shevchenko@linux.intel.com> Return-path: Received: from mga05.intel.com ([192.55.52.43]:52169 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754892AbeBAUUT (ORCPT ); Thu, 1 Feb 2018 15:20:19 -0500 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 Instead of playing tricks with last invalid entry, return simple -ENODATA error code casted to pointer. It would be good for future in case caller passes NULL pointer for ID table. Moreover, caller can check the code to be sure what happened inside callee. Fixes: 2b9c698efa58 ("ACPI / scan: Take the PRP0001 position in the list of IDs into account") Cc: Sinan Kaya Cc: Sakari Ailus Cc: Vinod Koul Signed-off-by: Andy Shevchenko --- v2: new patch drivers/acpi/bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index f87ed3be779a..a87a97bf75f8 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -762,7 +762,7 @@ static const struct acpi_device_id *__acpi_match_device( */ if (!strcmp(ACPI_DT_NAMESPACE_HID, hwid->id) && acpi_of_match_device(device, of_ids)) - return id; + return ERR_PTR(-ENODATA); } return NULL; } -- 2.15.1