diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-27 20:06:08 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-27 20:06:08 +0000 |
| commit | b87d07b13c779c42e4929e590003c9eb8c2f06fa (patch) | |
| tree | 9fbe55b61e176e783e5c6d6063733079d0274948 /drivers/regulator/max1586.c | |
| parent | 77b71b370ed06c75bdebef09be438d5275f70fc1 (diff) | |
| parent | 8dc995f56ef7aedb41873fdeaa1971f3aa166ebd (diff) | |
Merge branch 'topic/hotplug' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-max8997
Conflicts:
drivers/regulator/max8997.c
Diffstat (limited to 'drivers/regulator/max1586.c')
| -rw-r--r-- | drivers/regulator/max1586.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/regulator/max1586.c b/drivers/regulator/max1586.c index f67af3c1b963..3a035ece83c1 100644 --- a/drivers/regulator/max1586.c +++ b/drivers/regulator/max1586.c @@ -125,7 +125,7 @@ static struct regulator_desc max1586_reg[] = { }, }; -static int __devinit max1586_pmic_probe(struct i2c_client *client, +static int max1586_pmic_probe(struct i2c_client *client, const struct i2c_device_id *i2c_id) { struct regulator_dev **rdev; @@ -188,7 +188,7 @@ err: return ret; } -static int __devexit max1586_pmic_remove(struct i2c_client *client) +static int max1586_pmic_remove(struct i2c_client *client) { struct max1586_data *max1586 = i2c_get_clientdata(client); int i; @@ -207,7 +207,7 @@ MODULE_DEVICE_TABLE(i2c, max1586_id); static struct i2c_driver max1586_pmic_driver = { .probe = max1586_pmic_probe, - .remove = __devexit_p(max1586_pmic_remove), + .remove = max1586_pmic_remove, .driver = { .name = "max1586", .owner = THIS_MODULE, |