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 01/13] device property: always check for fwnode type
Date: Tue, 24 Nov 2015 12:22:47 +0200 [thread overview]
Message-ID: <1448360579-79260-2-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1448360579-79260-1-git-send-email-andriy.shevchenko@linux.intel.com>
Currently the property accessors unconditionally fall back to built-in property
set as a last resort. Make this strict and return an error in case the type of
fwnode is unknown.
This is actually a follow up to the commit 4fa7508e9f1c (device property:
Return -ENXIO if there is no suitable FW interface).
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/base/property.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/base/property.c b/drivers/base/property.c
index 1325ff2..09e488d 100644
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -135,8 +135,9 @@ bool fwnode_property_present(struct fwnode_handle *fwnode, const char *propname)
return of_property_read_bool(to_of_node(fwnode), propname);
else if (is_acpi_node(fwnode))
return !acpi_node_prop_get(fwnode, propname, NULL);
-
- return !!pset_prop_get(to_pset(fwnode), propname);
+ else if (is_pset(fwnode))
+ return !!pset_prop_get(to_pset(fwnode), propname);
+ return false;
}
EXPORT_SYMBOL_GPL(fwnode_property_present);
@@ -494,9 +495,10 @@ int fwnode_property_read_string(struct fwnode_handle *fwnode,
else if (is_acpi_node(fwnode))
return acpi_node_prop_read(fwnode, propname, DEV_PROP_STRING,
val, 1);
-
- return pset_prop_read_array(to_pset(fwnode), propname,
- DEV_PROP_STRING, val, 1);
+ else if (is_pset(fwnode))
+ return pset_prop_read_array(to_pset(fwnode), propname,
+ DEV_PROP_STRING, val, 1);
+ return -ENXIO;
}
EXPORT_SYMBOL_GPL(fwnode_property_read_string);
--
2.6.2
next prev parent reply other threads:[~2015-11-24 10:23 UTC|newest]
Thread overview: 29+ 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 ` Andy Shevchenko [this message]
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 ` [PATCH v1 07/13] device property: return -EINVAL when property isn't found in ACPI Andy Shevchenko
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 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: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-2-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.