xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gpio: sx150x: Use devm_gpiochip_add_data() for gpio registration

Browse Source 
Use devm_gpiochip_add_data() for GPIO registration and remove the
need of driver callback .remove.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
This commit is contained in:
Laxman Dewangan
2016-02-22 17:43:28 +05:30
parent 1a20cb2d7d
commit c7c8a8fc1e
1 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/gpio/gpio-sx150x.c
View File

@@ -687,7 +687,7 @@ static int sx150x_probe(struct i2c_client *client,
if (rc < 0) if (rc < 0)
return rc; return rc;
rc = gpiochip_add_data(&chip->gpio_chip, chip); rc = devm_gpiochip_add_data(&client->dev, &chip->gpio_chip, chip);
if (rc) if (rc)
return rc; return rc;
@@ -696,24 +696,11 @@ static int sx150x_probe(struct i2c_client *client,
pdata->irq_summary, pdata->irq_summary,
pdata->irq_base); pdata->irq_base);
if (rc < 0) if (rc < 0)
goto probe_fail_post_gpiochip_add; return rc;
} }
i2c_set_clientdata(client, chip); i2c_set_clientdata(client, chip);
return 0;
probe_fail_post_gpiochip_add:
gpiochip_remove(&chip->gpio_chip);
return rc;
}
static int sx150x_remove(struct i2c_client *client)
{
struct sx150x_chip *chip;
chip = i2c_get_clientdata(client);
gpiochip_remove(&chip->gpio_chip);
return 0; return 0;
} }
@@ -723,7 +710,6 @@ static struct i2c_driver sx150x_driver = {
.of_match_table = of_match_ptr(sx150x_of_match), .of_match_table = of_match_ptr(sx150x_of_match),
}, },
.probe = sx150x_probe, .probe = sx150x_probe,
.remove = sx150x_remove,
.id_table = sx150x_id, .id_table = sx150x_id,
}; };