diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2013-02-12 18:48:37 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2013-02-13 11:11:53 +0100 |
| commit | e80beb27d2f81a1c3c8887e0e0a82d77bb392d28 (patch) | |
| tree | 1f81c7ffb20b23d5f7a157e996fbb176779af88a /drivers/spi/spi-fsl-spi.c | |
| parent | of: Create function for counting number of phandles in a property (diff) | |
| download | linux-e80beb27d2f81a1c3c8887e0e0a82d77bb392d28.tar.xz linux-e80beb27d2f81a1c3c8887e0e0a82d77bb392d28.zip | |
gpio: Make of_count_named_gpios() use new of_count_phandle_with_args()
This patch replaces the horribly coded of_count_named_gpios() with a
call to of_count_phandle_with_args() which is far more efficient. This
also changes the return value of of_gpio_count() & of_gpio_named_count()
from 'unsigned int' to 'int' so that it can return an error code. All
the users of that function are fixed up to correctly handle a negative
return value.
v2: Split GPIO portion into a separate patch
Tested-by: Andreas Larsson <andreas@gaisler.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Rob Herring <rob.herring@calxeda.com>
Diffstat (limited to 'drivers/spi/spi-fsl-spi.c')
| -rw-r--r-- | drivers/spi/spi-fsl-spi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c index 1a7f6359d998..086a9eef2e05 100644 --- a/drivers/spi/spi-fsl-spi.c +++ b/drivers/spi/spi-fsl-spi.c @@ -947,12 +947,12 @@ static int of_fsl_spi_get_chipselects(struct device *dev) struct device_node *np = dev->of_node; struct fsl_spi_platform_data *pdata = dev->platform_data; struct mpc8xxx_spi_probe_info *pinfo = to_of_pinfo(pdata); - unsigned int ngpios; + int ngpios; int i = 0; int ret; ngpios = of_gpio_count(np); - if (!ngpios) { + if (ngpios <= 0) { /* * SPI w/o chip-select line. One SPI device is still permitted * though. |