diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 07:42:55 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 07:42:55 +0400 |
| commit | 1f9cc5f7716d664bfe32289ca61327be01a0a8e3 (patch) | |
| tree | 06b29c20a1d0c195fbf5513fdfb860cb38f09420 /drivers/regulator/ad5398.c | |
| parent | 207f30894a8469849d9f5663149d966ff4d411e8 (diff) | |
| parent | 8dc995f56ef7aedb41873fdeaa1971f3aa166ebd (diff) | |
| download | linux-1f9cc5f7716d664bfe32289ca61327be01a0a8e3.tar.xz | |
Merge remote-tracking branch 'regulator/topic/hotplug' into regulator-next
Diffstat (limited to 'drivers/regulator/ad5398.c')
| -rw-r--r-- | drivers/regulator/ad5398.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/regulator/ad5398.c b/drivers/regulator/ad5398.c index f123f7e3b752..6b981b5faa70 100644 --- a/drivers/regulator/ad5398.c +++ b/drivers/regulator/ad5398.c @@ -211,7 +211,7 @@ static const struct i2c_device_id ad5398_id[] = { }; MODULE_DEVICE_TABLE(i2c, ad5398_id); -static int __devinit ad5398_probe(struct i2c_client *client, +static int ad5398_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct regulator_init_data *init_data = client->dev.platform_data; @@ -256,7 +256,7 @@ err: return ret; } -static int __devexit ad5398_remove(struct i2c_client *client) +static int ad5398_remove(struct i2c_client *client) { struct ad5398_chip_info *chip = i2c_get_clientdata(client); @@ -266,7 +266,7 @@ static int __devexit ad5398_remove(struct i2c_client *client) static struct i2c_driver ad5398_driver = { .probe = ad5398_probe, - .remove = __devexit_p(ad5398_remove), + .remove = ad5398_remove, .driver = { .name = "ad5398", }, |