diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-27 21:06:08 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-27 21:06:08 +0100 |
| commit | b87d07b13c779c42e4929e590003c9eb8c2f06fa (patch) | |
| tree | 9fbe55b61e176e783e5c6d6063733079d0274948 /drivers/regulator/lp3972.c | |
| parent | regulator: add device tree support for max8997 (diff) | |
| parent | regulator: remove use of __devexit (diff) | |
| download | linux-b87d07b13c779c42e4929e590003c9eb8c2f06fa.tar.xz linux-b87d07b13c779c42e4929e590003c9eb8c2f06fa.zip | |
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/lp3972.c')
| -rw-r--r-- | drivers/regulator/lp3972.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/regulator/lp3972.c b/drivers/regulator/lp3972.c index 3cdc755d9b22..69c42c318b87 100644 --- a/drivers/regulator/lp3972.c +++ b/drivers/regulator/lp3972.c @@ -481,7 +481,7 @@ static const struct regulator_desc regulators[] = { }, }; -static int __devinit setup_regulators(struct lp3972 *lp3972, +static int setup_regulators(struct lp3972 *lp3972, struct lp3972_platform_data *pdata) { int i, err; @@ -523,7 +523,7 @@ err_nomem: return err; } -static int __devinit lp3972_i2c_probe(struct i2c_client *i2c, +static int lp3972_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { struct lp3972 *lp3972; @@ -569,7 +569,7 @@ err_detect: return ret; } -static int __devexit lp3972_i2c_remove(struct i2c_client *i2c) +static int lp3972_i2c_remove(struct i2c_client *i2c) { struct lp3972 *lp3972 = i2c_get_clientdata(i2c); int i; @@ -594,7 +594,7 @@ static struct i2c_driver lp3972_i2c_driver = { .owner = THIS_MODULE, }, .probe = lp3972_i2c_probe, - .remove = __devexit_p(lp3972_i2c_remove), + .remove = lp3972_i2c_remove, .id_table = lp3972_i2c_id, }; |