linux-i2c.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Jarkko Nikula <jarkko.nikula@linux.intel.com>,
	linux-i2c@vger.kernel.org, linux-acpi@vger.kernel.org,
	linux-kernel@vger.kernel.org, Lee Jones <lee.jones@linaro.org>,
	Mika Westerberg <mika.westerberg@linux.intel.com>,
	Kevin Fenzi <kevin@scrye.com>, Arnd Bergmann <arnd@arndb.de>,
	Wolfram Sang <wsa@the-dreams.de>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v1 07/13] device property: return -EINVAL when property isn't found in ACPI
Date: Tue, 24 Nov 2015 12:22:53 +0200	[thread overview]
Message-ID: <1448360579-79260-8-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1448360579-79260-1-git-send-email-andriy.shevchenko@linux.intel.com>

Change return code to be in align with OF and built-in device properties error
codes. In particular -EINVAL means property is not found.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/acpi/property.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c
index 88f4306..2aee416 100644
--- a/drivers/acpi/property.c
+++ b/drivers/acpi/property.c
@@ -346,7 +346,7 @@ void acpi_free_properties(struct acpi_device *adev)
  *
  * Return: %0 if property with @name has been found (success),
  *         %-EINVAL if the arguments are invalid,
- *         %-ENODATA if the property doesn't exist,
+ *         %-EINVAL if the property doesn't exist,
  *         %-EPROTO if the property value type doesn't match @type.
  */
 static int acpi_data_get_property(struct acpi_device_data *data,
@@ -360,7 +360,7 @@ static int acpi_data_get_property(struct acpi_device_data *data,
 		return -EINVAL;
 
 	if (!data->pointer || !data->properties)
-		return -ENODATA;
+		return -EINVAL;
 
 	properties = data->properties;
 	for (i = 0; i < properties->package.count; i++) {
@@ -375,13 +375,13 @@ static int acpi_data_get_property(struct acpi_device_data *data,
 		if (!strcmp(name, propname->string.pointer)) {
 			if (type != ACPI_TYPE_ANY && propvalue->type != type)
 				return -EPROTO;
-			else if (obj)
+			if (obj)
 				*obj = propvalue;
 
 			return 0;
 		}
 	}
-	return -ENODATA;
+	return -EINVAL;
 }
 
 /**
@@ -439,7 +439,7 @@ int acpi_node_prop_get(struct fwnode_handle *fwnode, const char *propname,
  *
  * Return: %0 if array property (package) with @name has been found (success),
  *         %-EINVAL if the arguments are invalid,
- *         %-ENODATA if the property doesn't exist,
+ *         %-EINVAL if the property doesn't exist,
  *         %-EPROTO if the property is not a package or the type of its elements
  *           doesn't match @type.
  */
-- 
2.6.2

  parent reply	other threads:[~2015-11-24 10:22 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-24 10:22 [PATCH v1 00/13] intel-lpss: support non-ACPI platforms Andy Shevchenko
2015-11-24 10:22 ` [PATCH v1 01/13] device property: always check for fwnode type Andy Shevchenko
2015-11-24 10:22 ` [PATCH v1 02/13] device property: rename helper functions Andy Shevchenko
2015-11-24 10:22 ` [PATCH v1 03/13] device property: refactor built-in properties support Andy Shevchenko
2015-11-24 14:37   ` Rafael J. Wysocki
2015-11-24 14:40     ` Andy Shevchenko
2015-11-24 10:22 ` [PATCH v1 04/13] device property: keep single value inplace Andy Shevchenko
2015-11-24 10:22 ` [PATCH v1 05/13] device property: helper macros for property entry creation Andy Shevchenko
2015-11-24 10:22 ` [PATCH v1 06/13] device property: improve readability of macros Andy Shevchenko
2015-11-24 10:22 ` Andy Shevchenko [this message]
2015-11-24 10:22 ` [PATCH v1 08/13] device property: Fallback to secondary fwnode if primary misses the property Andy Shevchenko
2015-11-24 10:22 ` [PATCH v1 09/13] mfd: core: propagate device properties to sub devices drivers Andy Shevchenko
2015-11-24 10:22 ` [PATCH v1 10/13] mfd: intel-lpss: Add support for passing device properties Andy Shevchenko
2015-11-24 10:22 ` [PATCH v1 11/13] mfd: intel-lpss: Pass HSUART configuration via properties Andy Shevchenko
2015-11-24 10:44   ` kbuild test robot
2015-11-24 11:13     ` Mika Westerberg
2015-11-24 19:53   ` Arnd Bergmann
2015-11-25 12:12     ` Mika Westerberg
2015-11-24 10:22 ` [PATCH v1 12/13] mfd: intel-lpss: Pass SDA hold time to I2C host controller driver Andy Shevchenko
2015-11-24 10:50   ` kbuild test robot
2015-11-24 10:22 ` [PATCH v1 13/13] i2c: designware: Convert to use unified device property API Andy Shevchenko
2015-11-24 10:53   ` Jarkko Nikula
2015-11-24 11:03     ` Mika Westerberg
2015-11-24 15:11 ` [PATCH v1 00/13] intel-lpss: support non-ACPI platforms Rafael J. Wysocki
2015-11-24 14:49   ` Andy Shevchenko
2015-11-24 20:00 ` Arnd Bergmann
2015-11-24 22:17   ` Rafael J. Wysocki

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1448360579-79260-8-git-send-email-andriy.shevchenko@linux.intel.com \
    --to=andriy.shevchenko@linux.intel.com \
    --cc=arnd@arndb.de \
    --cc=gregkh@linuxfoundation.org \
    --cc=jarkko.nikula@linux.intel.com \
    --cc=kevin@scrye.com \
    --cc=lee.jones@linaro.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mika.westerberg@linux.intel.com \
    --cc=rjw@rjwysocki.net \
    --cc=wsa@the-dreams.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).