[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20150209083328.937648580@linuxfoundation.org>
Date: Mon, 9 Feb 2015 16:33:46 +0800
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: linux-kernel@...r.kernel.org
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
stable@...r.kernel.org, Sonic Zhang <sonic.zhang@...log.com>,
Alexandre Courbot <acourbot@...dia.com>,
Antonio Fiol <antonio@...l.es>,
Linus Walleij <linus.walleij@...aro.org>
Subject: [PATCH 3.18 03/39] gpio: mcp23s08: handle default gpio base
3.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sonic Zhang <sonic.zhang@...log.com>
commit b184c388f773f30b6c707d3d4599b2db80f4390c upstream.
Create default gpio base if neither device node nor
platform data is defined.
Signed-off-by: Sonic Zhang <sonic.zhang@...log.com>
Reviewed-by: Alexandre Courbot <acourbot@...dia.com>
Tested-by: Antonio Fiol <antonio@...l.es>
Signed-off-by: Linus Walleij <linus.walleij@...aro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
---
drivers/gpio/gpio-mcp23s08.c | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
--- a/drivers/gpio/gpio-mcp23s08.c
+++ b/drivers/gpio/gpio-mcp23s08.c
@@ -785,9 +785,11 @@ static int mcp230xx_probe(struct i2c_cli
client->irq = irq_of_parse_and_map(client->dev.of_node, 0);
} else {
pdata = dev_get_platdata(&client->dev);
- if (!pdata || !gpio_is_valid(pdata->base)) {
- dev_dbg(&client->dev, "invalid platform data\n");
- return -EINVAL;
+ if (!pdata) {
+ pdata = devm_kzalloc(&client->dev,
+ sizeof(struct mcp23s08_platform_data),
+ GFP_KERNEL);
+ pdata->base = -1;
}
}
@@ -908,10 +910,11 @@ static int mcp23s08_probe(struct spi_dev
} else {
type = spi_get_device_id(spi)->driver_data;
pdata = dev_get_platdata(&spi->dev);
- if (!pdata || !gpio_is_valid(pdata->base)) {
- dev_dbg(&spi->dev,
- "invalid or missing platform data\n");
- return -EINVAL;
+ if (!pdata) {
+ pdata = devm_kzalloc(&spi->dev,
+ sizeof(struct mcp23s08_platform_data),
+ GFP_KERNEL);
+ pdata->base = -1;
}
for (addr = 0; addr < ARRAY_SIZE(pdata->chip); addr++) {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists