diff options
author | Michael Welling <mwelling@ieee.org> | 2014-06-10 14:46:34 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2014-07-04 19:14:06 -0400 |
commit | ef8290ac727b1718417a781412fb6c25e97b5389 (patch) | |
tree | a0a1a122eae9b351cb0ce0884a61e40ab97af4af /drivers/gpio | |
parent | 7171511eaec5bf23fb06078f59784a3a0626b38f (diff) |
gpio: mcp23s08: Eliminates redundant checking.
Unnecessary checking was added during the merge of the gpio branch.
This patch removes the extra unnecessary checking.
Signed-off-by: Michael Welling <mwelling@ieee.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio')
-rw-r--r-- | drivers/gpio/gpio-mcp23s08.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpio/gpio-mcp23s08.c b/drivers/gpio/gpio-mcp23s08.c index fe7c0e211f9a..57adbc90fdad 100644 --- a/drivers/gpio/gpio-mcp23s08.c +++ b/drivers/gpio/gpio-mcp23s08.c | |||
@@ -900,8 +900,6 @@ static int mcp23s08_probe(struct spi_device *spi) | |||
900 | if (spi_present_mask & (1 << addr)) | 900 | if (spi_present_mask & (1 << addr)) |
901 | chips++; | 901 | chips++; |
902 | } | 902 | } |
903 | if (!chips) | ||
904 | return -ENODEV; | ||
905 | } else { | 903 | } else { |
906 | type = spi_get_device_id(spi)->driver_data; | 904 | type = spi_get_device_id(spi)->driver_data; |
907 | pdata = dev_get_platdata(&spi->dev); | 905 | pdata = dev_get_platdata(&spi->dev); |
@@ -940,10 +938,6 @@ static int mcp23s08_probe(struct spi_device *spi) | |||
940 | if (!(spi_present_mask & (1 << addr))) | 938 | if (!(spi_present_mask & (1 << addr))) |
941 | continue; | 939 | continue; |
942 | chips--; | 940 | chips--; |
943 | if (chips < 0) { | ||
944 | dev_err(&spi->dev, "FATAL: invalid negative chip id\n"); | ||
945 | goto fail; | ||
946 | } | ||
947 | data->mcp[addr] = &data->chip[chips]; | 941 | data->mcp[addr] = &data->chip[chips]; |
948 | status = mcp23s08_probe_one(data->mcp[addr], &spi->dev, spi, | 942 | status = mcp23s08_probe_one(data->mcp[addr], &spi->dev, spi, |
949 | 0x40 | (addr << 1), type, base, | 943 | 0x40 | (addr << 1), type, base, |