From: Andreas Larsson <andreas-FkzTOoA/JUlBDgjK7y7TUQ@public.gmane.org>
To: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
Cc: software-FkzTOoA/JUlBDgjK7y7TUQ@public.gmane.org,
Linus Walleij
<linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>,
spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org,
devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org
Subject: [PATCH 2/6] of: Return -ENXIO from of_parse_phandle_with_args for too large index and return errors from of_gpio_named_count
Date: Thu, 27 Dec 2012 13:10:43 +0100 [thread overview]
Message-ID: <1356610247-11491-3-git-send-email-andreas@gaisler.com> (raw)
In-Reply-To: <1356610247-11491-1-git-send-email-andreas-FkzTOoA/JUlBDgjK7y7TUQ@public.gmane.org>
This lets of_gpio_named_count return an errno on errors by being able to
distinguish between reaching the end of the phandle list and getting some other
error from of_parse_phandle_with_args.
Return error from of_spi_register_master when there is an "cs-gpios" list for
which gp_gpio_named_count fails.
Adjust drivers/hwmon/gpio-fan.c to cope with error return.
Signed-off-by: Andreas Larsson <andreas-FkzTOoA/JUlBDgjK7y7TUQ@public.gmane.org>
---
Uses -ENXIO modelled after uses such as in platform_get_irq, but maybe some
other errno than ENXIO is more appropriate for this case.
drivers/gpio/gpiolib-of.c | 8 +++++---
drivers/hwmon/gpio-fan.c | 2 +-
drivers/of/base.c | 5 ++++-
drivers/spi/spi.c | 11 +++++++----
4 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
index d542a14..28f24a6 100644
--- a/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@ -107,11 +107,10 @@ EXPORT_SYMBOL(of_get_named_gpio_flags);
*/
unsigned int of_gpio_named_count(struct device_node *np, const char* propname)
{
+ int ret;
unsigned int cnt = 0;
do {
- int ret;
-
ret = of_parse_phandle_with_args(np, propname, "#gpio-cells",
cnt, NULL);
/* A hole in the gpios = <> counts anyway. */
@@ -119,7 +118,10 @@ unsigned int of_gpio_named_count(struct device_node *np, const char* propname)
break;
} while (++cnt);
- return cnt;
+ if (ret == -ENXIO)
+ return cnt;
+ else
+ return ret;
}
EXPORT_SYMBOL(of_gpio_named_count);
diff --git a/drivers/hwmon/gpio-fan.c b/drivers/hwmon/gpio-fan.c
index 4e04c12..9ccd92f 100644
--- a/drivers/hwmon/gpio-fan.c
+++ b/drivers/hwmon/gpio-fan.c
@@ -477,7 +477,7 @@ static int gpio_fan_get_of_pdata(struct device *dev,
pdata->speed = speed;
/* Alarm GPIO if one exists */
- if (of_gpio_named_count(node, "alarm-gpios")) {
+ if (of_gpio_named_count(node, "alarm-gpios") > 0) {
struct gpio_fan_alarm *alarm;
int val;
enum of_gpio_flags flags;
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 986afd7..1f16629 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1110,7 +1110,10 @@ int of_parse_phandle_with_args(const struct device_node *np, const char *list_na
/* Loop exited without finding a valid entry; return an error */
if (node)
of_node_put(node);
- return -EINVAL;
+ if (list == list_end)
+ return -ENXIO; /* Index beyond end of list */
+ else
+ return -EINVAL;
}
EXPORT_SYMBOL(of_parse_phandle_with_args);
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 19ee901..9c2acf1 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1059,7 +1059,7 @@ EXPORT_SYMBOL_GPL(spi_alloc_master);
#ifdef CONFIG_OF
static int of_spi_register_master(struct spi_master *master)
{
- u16 nb;
+ int nb;
int i, *cs;
struct device_node *np = master->dev.of_node;
@@ -1067,10 +1067,13 @@ static int of_spi_register_master(struct spi_master *master)
return 0;
nb = of_gpio_named_count(np, "cs-gpios");
- master->num_chipselect = max(nb, master->num_chipselect);
-
- if (nb < 1)
+ if (nb == 0 || nb == -ENOENT) /* No error if cs-gpios does not exist */
return 0;
+ else if (nb < 0)
+ return nb;
+
+ if (nb > master->num_chipselect)
+ master->num_chipselect = (u16)nb;
cs = devm_kzalloc(&master->dev,
sizeof(int) * master->num_chipselect,
--
1.7.0.4
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122712
next prev parent reply other threads:[~2012-12-27 12:10 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-27 12:10 [PATCH 0/6] of, of_gpio, of_spi: Fix and improve of_parse_phandle_with_args, of_gpio_named_count and of_spi_register_master Andreas Larsson
[not found] ` <1356610247-11491-1-git-send-email-andreas-FkzTOoA/JUlBDgjK7y7TUQ@public.gmane.org>
2012-12-27 12:10 ` [PATCH 1/6] of: Return -EEXIST from of_parse_phandle_with_args for holes in phandle list Andreas Larsson
2012-12-27 12:10 ` Andreas Larsson [this message]
[not found] ` <1356610247-11491-3-git-send-email-andreas-FkzTOoA/JUlBDgjK7y7TUQ@public.gmane.org>
2012-12-28 11:02 ` [PATCH 2/6] of: Return -ENXIO from of_parse_phandle_with_args for too large index and return errors from of_gpio_named_count Andreas Larsson
2012-12-27 12:10 ` [PATCH 4/6] of_spi: Document cs_gpios and cs_gpio in kernel-doc Andreas Larsson
2012-12-27 12:10 ` [PATCH 3/6] of_spi: Initialize cs_gpios properly Andreas Larsson
2012-12-27 12:10 ` [PATCH 5/6] of_spi: Add fetching of of_gpio flags to of_spi_register_master Andreas Larsson
2012-12-27 12:10 ` [PATCH 6/6] of_spi: Initialize cs_gpios and cs_gpio with -EEXIST Andreas Larsson
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=1356610247-11491-3-git-send-email-andreas@gaisler.com \
--to=andreas-fkztooa/julbdgjk7y7tuq@public.gmane.org \
--cc=devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org \
--cc=grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org \
--cc=linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org \
--cc=software-FkzTOoA/JUlBDgjK7y7TUQ@public.gmane.org \
--cc=spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org \
/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).