diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2016-02-22 13:13:28 +0100 |
|---|---|---|
| committer | Laxman Dewangan <ldewangan@nvidia.com> | 2016-02-23 15:49:46 +0100 |
| commit | daa994bfe22ed690fb8e377c43faf7e16aad59da (patch) | |
| tree | c18a06fe89820b5a99d6802950fe1e6061d0266c /drivers/gpio/gpio-adnp.c | |
| parent | gpio: 74xx-mmio: Use devm_gpiochip_add_data() for gpio registration (diff) | |
| download | linux-daa994bfe22ed690fb8e377c43faf7e16aad59da.tar.xz linux-daa994bfe22ed690fb8e377c43faf7e16aad59da.zip | |
gpio: adnp: Use devm_gpiochip_add_data() for gpio registration
Use devm_gpiochip_add_data() for GPIO registration and remove the
call for gpiochip_remove() from error path.
Also remove the need of driver callback .remove.
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Cc: Alexandre Courbot <gnurou@gmail.com>
Diffstat (limited to 'drivers/gpio/gpio-adnp.c')
| -rw-r--r-- | drivers/gpio/gpio-adnp.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/gpio/gpio-adnp.c b/drivers/gpio/gpio-adnp.c index fb5b47b69f14..8ff7b0d3eac6 100644 --- a/drivers/gpio/gpio-adnp.c +++ b/drivers/gpio/gpio-adnp.c @@ -265,7 +265,7 @@ static int adnp_gpio_setup(struct adnp *adnp, unsigned int num_gpios) chip->of_node = chip->parent->of_node; chip->owner = THIS_MODULE; - err = gpiochip_add_data(chip, adnp); + err = devm_gpiochip_add_data(&adnp->client->dev, chip, adnp); if (err) return err; @@ -520,14 +520,6 @@ static int adnp_i2c_probe(struct i2c_client *client, return 0; } -static int adnp_i2c_remove(struct i2c_client *client) -{ - struct adnp *adnp = i2c_get_clientdata(client); - - gpiochip_remove(&adnp->gpio); - return 0; -} - static const struct i2c_device_id adnp_i2c_id[] = { { "gpio-adnp" }, { }, @@ -546,7 +538,6 @@ static struct i2c_driver adnp_i2c_driver = { .of_match_table = adnp_of_match, }, .probe = adnp_i2c_probe, - .remove = adnp_i2c_remove, .id_table = adnp_i2c_id, }; module_i2c_driver(adnp_i2c_driver); |