renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-21 11:44:01 +08:00
Code

pinctrl: mcp23s08: switch to devm_gpiochip_add_data

Browse Source 
Switching to devm_gpiochip_add_data simplifies the driver's
cleanup routine and safes a few loc.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Sebastian Reichel 2017-05-15 11:24:32 +02:00 committed by Linus Walleij
parent 2f98e78b5a
commit d0e49dabc6
1 changed files with 2 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/pinctrl/pinctrl-mcp23s08.c
View File

@ -898,7 +898,7 @@ static int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev,
goto fail; goto fail;
} }
ret = gpiochip_add_data(&mcp->chip, mcp); ret = devm_gpiochip_add_data(dev, &mcp->chip, mcp);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
@ -1034,15 +1034,6 @@ static int mcp230xx_probe(struct i2c_client *client,
return 0; return 0;
} }
static int mcp230xx_remove(struct i2c_client *client)
{
struct mcp23s08 *mcp = i2c_get_clientdata(client);
gpiochip_remove(&mcp->chip);
return 0;
}
static const struct i2c_device_id mcp230xx_id[] = { static const struct i2c_device_id mcp230xx_id[] = {
{ "mcp23008", MCP_TYPE_008 }, { "mcp23008", MCP_TYPE_008 },
{ "mcp23017", MCP_TYPE_017 }, { "mcp23017", MCP_TYPE_017 },
@ -1056,7 +1047,6 @@ static struct i2c_driver mcp230xx_driver = {
.of_match_table = of_match_ptr(mcp23s08_i2c_of_match), .of_match_table = of_match_ptr(mcp23s08_i2c_of_match),
}, },
.probe = mcp230xx_probe, .probe = mcp230xx_probe,
.remove = mcp230xx_remove,
.id_table = mcp230xx_id, .id_table = mcp230xx_id,
}; };
@ -1166,7 +1156,7 @@ static int mcp23s08_probe(struct spi_device *spi)
0x40 | (addr << 1), type, pdata, 0x40 | (addr << 1), type, pdata,
addr); addr);
if (status < 0) if (status < 0)
goto fail; return status;
if (pdata->base != -1) if (pdata->base != -1)
pdata->base += data->mcp[addr]->chip.ngpio; pdata->base += data->mcp[addr]->chip.ngpio;
@ -1180,31 +1170,6 @@ static int mcp23s08_probe(struct spi_device *spi)
*/ */
return 0; return 0;
fail:
for (addr = 0; addr < ARRAY_SIZE(data->mcp); addr++) {
if (!data->mcp[addr])
continue;
gpiochip_remove(&data->mcp[addr]->chip);
}
return status;
}
static int mcp23s08_remove(struct spi_device *spi)
{
struct mcp23s08_driver_data *data = spi_get_drvdata(spi);
unsigned addr;
for (addr = 0; addr < ARRAY_SIZE(data->mcp); addr++) {
if (!data->mcp[addr])
continue;
gpiochip_remove(&data->mcp[addr]->chip);
}
return 0;
} }
static const struct spi_device_id mcp23s08_ids[] = { static const struct spi_device_id mcp23s08_ids[] = {
@ -1217,7 +1182,6 @@ MODULE_DEVICE_TABLE(spi, mcp23s08_ids);
static struct spi_driver mcp23s08_driver = { static struct spi_driver mcp23s08_driver = {
.probe = mcp23s08_probe, .probe = mcp23s08_probe,
.remove = mcp23s08_remove,
.id_table = mcp23s08_ids, .id_table = mcp23s08_ids,
.driver = { .driver = {
.name = "mcp23s08", .name = "mcp23s08",