leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gpio: pcf857x: Use devm_gpiochip_add_data() for gpio registration

Browse Source 
Use devm_gpiochip_add_data() for GPIO registration and clean the
error path.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
This commit is contained in:
Laxman Dewangan 2016-02-22 17:43:28 +05:30
parent 0ece84f54a
commit 3aebfc9bd8
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpio/gpio-pcf857x.c
View File

@ -372,7 +372,7 @@ static int pcf857x_probe(struct i2c_client *client,
gpio->out = ~n_latch; gpio->out = ~n_latch;
gpio->status = gpio->out; gpio->status = gpio->out;
status = gpiochip_add_data(&gpio->chip, gpio); status = devm_gpiochip_add_data(&client->dev, &gpio->chip, gpio);
if (status < 0) if (status < 0)
goto fail; goto fail;
@ -383,7 +383,7 @@ static int pcf857x_probe(struct i2c_client *client,
IRQ_TYPE_NONE); IRQ_TYPE_NONE);
if (status) { if (status) {
dev_err(&client->dev, "cannot add irqchip\n"); dev_err(&client->dev, "cannot add irqchip\n");
goto fail_irq; goto fail;
} }
status = devm_request_threaded_irq(&client->dev, client->irq, status = devm_request_threaded_irq(&client->dev, client->irq,
@ -391,7 +391,7 @@ static int pcf857x_probe(struct i2c_client *client,
IRQF_TRIGGER_FALLING | IRQF_SHARED, IRQF_TRIGGER_FALLING | IRQF_SHARED,
dev_name(&client->dev), gpio); dev_name(&client->dev), gpio);
if (status) if (status)
goto fail_irq; goto fail;
gpiochip_set_chained_irqchip(&gpio->chip, &pcf857x_irq_chip, gpiochip_set_chained_irqchip(&gpio->chip, &pcf857x_irq_chip,
client->irq, NULL); client->irq, NULL);
@ -413,9 +413,6 @@ static int pcf857x_probe(struct i2c_client *client,
return 0; return 0;
fail_irq:
gpiochip_remove(&gpio->chip);
fail: fail:
dev_dbg(&client->dev, "probe error %d for '%s'\n", status, dev_dbg(&client->dev, "probe error %d for '%s'\n", status,
client->name); client->name);
@ -440,7 +437,6 @@ static int pcf857x_remove(struct i2c_client *client)
} }
} }
gpiochip_remove(&gpio->chip);
return status; return status;
} }