hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

regulator: use dev_get_platdata() 

Use the wrapper function for retrieving the platform data instead of
accessing dev->platform_data directly.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Jingoo Han 2013-07-30 17:20:47 +09:00 committed by Mark Brown
parent 6625d9d297
commit dff91d0b72
38 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/regulator/88pm800.c
View File

@ -283,7 +283,7 @@ static int pm800_regulator_dt_init(struct platform_device *pdev)
static int pm800_regulator_probe(struct platform_device *pdev) static int pm800_regulator_probe(struct platform_device *pdev)
{ {
struct pm80x_chip *chip = dev_get_drvdata(pdev->dev.parent); struct pm80x_chip *chip = dev_get_drvdata(pdev->dev.parent);
struct pm80x_platform_data *pdata = pdev->dev.parent->platform_data; struct pm80x_platform_data *pdata = dev_get_platdata(pdev->dev.parent);
struct pm800_regulators *pm800_data; struct pm800_regulators *pm800_data;
struct pm800_regulator_info *info; struct pm800_regulator_info *info;
struct regulator_config config = { }; struct regulator_config config = { };

2
drivers/regulator/88pm8607.c
View File

@ -346,7 +346,7 @@ static int pm8607_regulator_probe(struct platform_device *pdev)
{ {
struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent); struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);
struct pm8607_regulator_info *info = NULL; struct pm8607_regulator_info *info = NULL;
struct regulator_init_data *pdata = pdev->dev.platform_data; struct regulator_init_data *pdata = dev_get_platdata(&pdev->dev);
struct regulator_config config = { }; struct regulator_config config = { };
struct resource *res; struct resource *res;
int i; int i;

2
drivers/regulator/aat2870-regulator.c
View File

@ -174,7 +174,7 @@ static int aat2870_regulator_probe(struct platform_device *pdev)
config.dev = &pdev->dev; config.dev = &pdev->dev;
config.driver_data = ri; config.driver_data = ri;
config.init_data = pdev->dev.platform_data; config.init_data = dev_get_platdata(&pdev->dev);
rdev = regulator_register(&ri->desc, &config); rdev = regulator_register(&ri->desc, &config);
if (IS_ERR(rdev)) { if (IS_ERR(rdev)) {

2
drivers/regulator/ab3100.c
View File

@ -660,7 +660,7 @@ ab3100_regulator_of_probe(struct platform_device *pdev, struct device_node *np)
static int ab3100_regulators_probe(struct platform_device *pdev) static int ab3100_regulators_probe(struct platform_device *pdev)
{ {
struct ab3100_platform_data *plfdata = pdev->dev.platform_data; struct ab3100_platform_data *plfdata = dev_get_platdata(&pdev->dev);
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
int err = 0; int err = 0;
u8 data; u8 data;

2
drivers/regulator/ad5398.c
View File

@ -214,7 +214,7 @@ MODULE_DEVICE_TABLE(i2c, ad5398_id);
static int ad5398_probe(struct i2c_client *client, static int ad5398_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct regulator_init_data *init_data = client->dev.platform_data; struct regulator_init_data *init_data = dev_get_platdata(&client->dev);
struct regulator_config config = { }; struct regulator_config config = { };
struct ad5398_chip_info *chip; struct ad5398_chip_info *chip;
const struct ad5398_current_data_format *df = const struct ad5398_current_data_format *df =

2
drivers/regulator/da903x.c
View File

@ -485,7 +485,7 @@ static int da903x_regulator_probe(struct platform_device *pdev)
ri->desc.ops = &da9030_regulator_ldo1_15_ops; ri->desc.ops = &da9030_regulator_ldo1_15_ops;
config.dev = &pdev->dev; config.dev = &pdev->dev;
config.init_data = pdev->dev.platform_data; config.init_data = dev_get_platdata(&pdev->dev);
config.driver_data = ri; config.driver_data = ri;
rdev = regulator_register(&ri->desc, &config); rdev = regulator_register(&ri->desc, &config);

2
drivers/regulator/da9052-regulator.c
View File

@ -349,7 +349,7 @@ static int da9052_regulator_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
da9052 = dev_get_drvdata(pdev->dev.parent); da9052 = dev_get_drvdata(pdev->dev.parent);
pdata = da9052->dev->platform_data; pdata = dev_get_platdata(da9052->dev);
regulator->da9052 = da9052; regulator->da9052 = da9052;
regulator->info = find_regulator_info(regulator->da9052->chip_id, regulator->info = find_regulator_info(regulator->da9052->chip_id,

2
drivers/regulator/da9055-regulator.c
View File

@ -535,7 +535,7 @@ static int da9055_regulator_probe(struct platform_device *pdev)
struct regulator_config config = { }; struct regulator_config config = { };
struct da9055_regulator *regulator; struct da9055_regulator *regulator;
struct da9055 *da9055 = dev_get_drvdata(pdev->dev.parent); struct da9055 *da9055 = dev_get_drvdata(pdev->dev.parent);
struct da9055_pdata *pdata = da9055->dev->platform_data; struct da9055_pdata *pdata = dev_get_platdata(da9055->dev);
int ret, irq; int ret, irq;
if (pdata == NULL || pdata->regulators[pdev->id] == NULL) if (pdata == NULL || pdata->regulators[pdev->id] == NULL)

2
drivers/regulator/fan53555.c
View File

@ -237,7 +237,7 @@ static int fan53555_regulator_probe(struct i2c_client *client,
unsigned int val; unsigned int val;
int ret; int ret;
pdata = client->dev.platform_data; pdata = dev_get_platdata(&client->dev);
if (!pdata || !pdata->regulator) { if (!pdata || !pdata->regulator) {
dev_err(&client->dev, "Platform data not found!\n"); dev_err(&client->dev, "Platform data not found!\n");
return -ENODEV; return -ENODEV;

2
drivers/regulator/fixed.c
View File

@ -146,7 +146,7 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev)
if (IS_ERR(config)) if (IS_ERR(config))
return PTR_ERR(config); return PTR_ERR(config);
} else { } else {
config = pdev->dev.platform_data; config = dev_get_platdata(&pdev->dev);
} }
if (!config) if (!config)

2
drivers/regulator/gpio-regulator.c
View File

@ -219,7 +219,7 @@ static struct regulator_ops gpio_regulator_current_ops = {
static int gpio_regulator_probe(struct platform_device *pdev) static int gpio_regulator_probe(struct platform_device *pdev)
{ {
struct gpio_regulator_config *config = pdev->dev.platform_data; struct gpio_regulator_config *config = dev_get_platdata(&pdev->dev);
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
struct gpio_regulator_data *drvdata; struct gpio_regulator_data *drvdata;
struct regulator_config cfg = { }; struct regulator_config cfg = { };

2
drivers/regulator/isl6271a-regulator.c
View File

@ -110,7 +110,7 @@ static int isl6271a_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct regulator_config config = { }; struct regulator_config config = { };
struct regulator_init_data *init_data = i2c->dev.platform_data; struct regulator_init_data *init_data = dev_get_platdata(&i2c->dev);
struct isl_pmic *pmic; struct isl_pmic *pmic;
int err, i; int err, i;

2
drivers/regulator/lp3971.c
View File

@ -425,7 +425,7 @@ static int lp3971_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct lp3971 *lp3971; struct lp3971 *lp3971;
struct lp3971_platform_data *pdata = i2c->dev.platform_data; struct lp3971_platform_data *pdata = dev_get_platdata(&i2c->dev);
int ret; int ret;
u16 val; u16 val;

2
drivers/regulator/lp3972.c
View File

@ -519,7 +519,7 @@ static int lp3972_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct lp3972 *lp3972; struct lp3972 *lp3972;
struct lp3972_platform_data *pdata = i2c->dev.platform_data; struct lp3972_platform_data *pdata = dev_get_platdata(&i2c->dev);
int ret; int ret;
u16 val; u16 val;

2
drivers/regulator/lp872x.c
View File

@ -961,7 +961,7 @@ static int lp872x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
} }
lp->dev = &cl->dev; lp->dev = &cl->dev;
lp->pdata = cl->dev.platform_data; lp->pdata = dev_get_platdata(&cl->dev);
lp->chipid = id->driver_data; lp->chipid = id->driver_data;
lp->num_regulators = num_regulators; lp->num_regulators = num_regulators;
i2c_set_clientdata(cl, lp); i2c_set_clientdata(cl, lp);

2
drivers/regulator/lp8755.c
View File

@ -449,7 +449,7 @@ static int lp8755_probe(struct i2c_client *client,
{ {
int ret, icnt; int ret, icnt;
struct lp8755_chip *pchip; struct lp8755_chip *pchip;
struct lp8755_platform_data *pdata = client->dev.platform_data; struct lp8755_platform_data *pdata = dev_get_platdata(&client->dev);
if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) { if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
dev_err(&client->dev, "i2c functionality check fail.\n"); dev_err(&client->dev, "i2c functionality check fail.\n");

2
drivers/regulator/max1586.c
View File

@ -163,7 +163,7 @@ static int max1586_pmic_probe(struct i2c_client *client,
const struct i2c_device_id *i2c_id) const struct i2c_device_id *i2c_id)
{ {
struct regulator_dev **rdev; struct regulator_dev **rdev;
struct max1586_platform_data *pdata = client->dev.platform_data; struct max1586_platform_data *pdata = dev_get_platdata(&client->dev);
struct regulator_config config = { }; struct regulator_config config = { };
struct max1586_data *max1586; struct max1586_data *max1586;
int i, id, ret = -ENOMEM; int i, id, ret = -ENOMEM;

2
drivers/regulator/max8649.c
View File

@ -152,7 +152,7 @@ static struct regmap_config max8649_regmap_config = {
static int max8649_regulator_probe(struct i2c_client *client, static int max8649_regulator_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct max8649_platform_data *pdata = client->dev.platform_data; struct max8649_platform_data *pdata = dev_get_platdata(&client->dev);
struct max8649_regulator_info *info = NULL; struct max8649_regulator_info *info = NULL;
struct regulator_config config = { }; struct regulator_config config = { };
unsigned int val; unsigned int val;

2
drivers/regulator/max8660.c
View File

@ -309,7 +309,7 @@ static int max8660_probe(struct i2c_client *client,
const struct i2c_device_id *i2c_id) const struct i2c_device_id *i2c_id)
{ {
struct regulator_dev **rdev; struct regulator_dev **rdev;
struct max8660_platform_data *pdata = client->dev.platform_data; struct max8660_platform_data *pdata = dev_get_platdata(&client->dev);
struct regulator_config config = { }; struct regulator_config config = { };
struct max8660 *max8660; struct max8660 *max8660;
int boot_on, i, id, ret = -EINVAL; int boot_on, i, id, ret = -EINVAL;

2
drivers/regulator/max8925-regulator.c
View File

@ -277,7 +277,7 @@ static int max8925_regulator_dt_init(struct platform_device *pdev,
static int max8925_regulator_probe(struct platform_device *pdev) static int max8925_regulator_probe(struct platform_device *pdev)
{ {
struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent); struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);
struct regulator_init_data *pdata = pdev->dev.platform_data; struct regulator_init_data *pdata = dev_get_platdata(&pdev->dev);
struct regulator_config config = { }; struct regulator_config config = { };
struct max8925_regulator_info *ri; struct max8925_regulator_info *ri;
struct resource *res; struct resource *res;

2
drivers/regulator/max8952.c
View File

@ -196,7 +196,7 @@ static int max8952_pmic_probe(struct i2c_client *client,
const struct i2c_device_id *i2c_id) const struct i2c_device_id *i2c_id)
{ {
struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
struct max8952_platform_data *pdata = client->dev.platform_data; struct max8952_platform_data *pdata = dev_get_platdata(&client->dev);
struct regulator_config config = { }; struct regulator_config config = { };
struct max8952_data *max8952; struct max8952_data *max8952;

2
drivers/regulator/max8973-regulator.c
View File

@ -371,7 +371,7 @@ static int max8973_probe(struct i2c_client *client,
struct max8973_chip *max; struct max8973_chip *max;
int ret; int ret;
pdata = client->dev.platform_data; pdata = dev_get_platdata(&client->dev);
if (!pdata && !client->dev.of_node) { if (!pdata && !client->dev.of_node) {
dev_err(&client->dev, "No Platform data"); dev_err(&client->dev, "No Platform data");

2
drivers/regulator/palmas-regulator.c
View File

@ -765,7 +765,7 @@ static void palmas_dt_to_pdata(struct device *dev,
static int palmas_regulators_probe(struct platform_device *pdev) static int palmas_regulators_probe(struct platform_device *pdev)
{ {
struct palmas *palmas = dev_get_drvdata(pdev->dev.parent); struct palmas *palmas = dev_get_drvdata(pdev->dev.parent);
struct palmas_pmic_platform_data *pdata = pdev->dev.platform_data; struct palmas_pmic_platform_data *pdata = dev_get_platdata(&pdev->dev);
struct device_node *node = pdev->dev.of_node; struct device_node *node = pdev->dev.of_node;
struct regulator_dev *rdev; struct regulator_dev *rdev;
struct regulator_config config = { }; struct regulator_config config = { };

2
drivers/regulator/pcap-regulator.c
View File

@ -243,7 +243,7 @@ static int pcap_regulator_probe(struct platform_device *pdev)
struct regulator_config config = { }; struct regulator_config config = { };
config.dev = &pdev->dev; config.dev = &pdev->dev;
config.init_data = pdev->dev.platform_data; config.init_data = dev_get_platdata(&pdev->dev);
config.driver_data = pcap; config.driver_data = pcap;
rdev = regulator_register(&pcap_regulators[pdev->id], &config); rdev = regulator_register(&pcap_regulators[pdev->id], &config);

2
drivers/regulator/pcf50633-regulator.c
View File

@ -86,7 +86,7 @@ static int pcf50633_regulator_probe(struct platform_device *pdev)
pcf = dev_to_pcf50633(pdev->dev.parent); pcf = dev_to_pcf50633(pdev->dev.parent);
config.dev = &pdev->dev; config.dev = &pdev->dev;
config.init_data = pdev->dev.platform_data; config.init_data = dev_get_platdata(&pdev->dev);
config.driver_data = pcf; config.driver_data = pcf;
config.regmap = pcf->regmap; config.regmap = pcf->regmap;

2
drivers/regulator/tps51632-regulator.c
View File

@ -275,7 +275,7 @@ static int tps51632_probe(struct i2c_client *client,
} }
} }
pdata = client->dev.platform_data; pdata = dev_get_platdata(&client->dev);
if (!pdata && client->dev.of_node) if (!pdata && client->dev.of_node)
pdata = of_get_tps51632_platform_data(&client->dev); pdata = of_get_tps51632_platform_data(&client->dev);
if (!pdata) { if (!pdata) {

2
drivers/regulator/tps62360-regulator.c
View File

@ -350,7 +350,7 @@ static int tps62360_probe(struct i2c_client *client,
int i; int i;
int chip_id; int chip_id;
pdata = client->dev.platform_data; pdata = dev_get_platdata(&client->dev);
if (client->dev.of_node) { if (client->dev.of_node) {
const struct of_device_id *match; const struct of_device_id *match;

2
drivers/regulator/tps65023-regulator.c
View File

@ -218,7 +218,7 @@ static int tps_65023_probe(struct i2c_client *client,
* init_data points to array of regulator_init structures * init_data points to array of regulator_init structures
* coming from the board-evm file. * coming from the board-evm file.
*/ */
init_data = client->dev.platform_data; init_data = dev_get_platdata(&client->dev);
if (!init_data) if (!init_data)
return -EIO; return -EIO;

2
drivers/regulator/tps6524x-regulator.c
View File

@ -601,7 +601,7 @@ static int pmic_probe(struct spi_device *spi)
struct regulator_config config = { }; struct regulator_config config = { };
int ret = 0, i; int ret = 0, i;
init_data = dev->platform_data; init_data = dev_get_platdata(dev);
if (!init_data) { if (!init_data) {
dev_err(dev, "could not find regulator platform data\n"); dev_err(dev, "could not find regulator platform data\n");
return -EINVAL; return -EINVAL;

2
drivers/regulator/twl-regulator.c
View File

@ -1108,7 +1108,7 @@ static int twlreg_probe(struct platform_device *pdev)
drvdata = NULL; drvdata = NULL;
} else { } else {
id = pdev->id; id = pdev->id;
initdata = pdev->dev.platform_data; initdata = dev_get_platdata(&pdev->dev);
for (i = 0, template = NULL; i < ARRAY_SIZE(twl_of_match); i++) { for (i = 0, template = NULL; i < ARRAY_SIZE(twl_of_match); i++) {
template = twl_of_match[i].data; template = twl_of_match[i].data;
if (template && template->desc.id == id) if (template && template->desc.id == id)

2
drivers/regulator/userspace-consumer.c
View File

@ -111,7 +111,7 @@ static int regulator_userspace_consumer_probe(struct platform_device *pdev)
struct userspace_consumer_data *drvdata; struct userspace_consumer_data *drvdata;
int ret; int ret;
pdata = pdev->dev.platform_data; pdata = dev_get_platdata(&pdev->dev);
if (!pdata) if (!pdata)
return -EINVAL; return -EINVAL;

2
drivers/regulator/virtual.c
View File

@ -287,7 +287,7 @@ static const struct attribute_group regulator_virtual_attr_group = {
static int regulator_virtual_probe(struct platform_device *pdev) static int regulator_virtual_probe(struct platform_device *pdev)
{ {
char *reg_id = pdev->dev.platform_data; char *reg_id = dev_get_platdata(&pdev->dev);
struct virtual_consumer_data *drvdata; struct virtual_consumer_data *drvdata;
int ret; int ret;

8
drivers/regulator/wm831x-dcdc.c
View File

@ -451,7 +451,7 @@ static void wm831x_buckv_dvs_init(struct wm831x_dcdc *dcdc,
static int wm831x_buckv_probe(struct platform_device *pdev) static int wm831x_buckv_probe(struct platform_device *pdev)
{ {
struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent); struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
struct wm831x_pdata *pdata = wm831x->dev->platform_data; struct wm831x_pdata *pdata = dev_get_platdata(wm831x->dev);
struct regulator_config config = { }; struct regulator_config config = { };
int id; int id;
struct wm831x_dcdc *dcdc; struct wm831x_dcdc *dcdc;
@ -624,7 +624,7 @@ static struct regulator_ops wm831x_buckp_ops = {
static int wm831x_buckp_probe(struct platform_device *pdev) static int wm831x_buckp_probe(struct platform_device *pdev)
{ {
struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent); struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
struct wm831x_pdata *pdata = wm831x->dev->platform_data; struct wm831x_pdata *pdata = dev_get_platdata(wm831x->dev);
struct regulator_config config = { }; struct regulator_config config = { };
int id; int id;
struct wm831x_dcdc *dcdc; struct wm831x_dcdc *dcdc;
@ -770,7 +770,7 @@ static struct regulator_ops wm831x_boostp_ops = {
static int wm831x_boostp_probe(struct platform_device *pdev) static int wm831x_boostp_probe(struct platform_device *pdev)
{ {
struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent); struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
struct wm831x_pdata *pdata = wm831x->dev->platform_data; struct wm831x_pdata *pdata = dev_get_platdata(wm831x->dev);
struct regulator_config config = { }; struct regulator_config config = { };
int id = pdev->id % ARRAY_SIZE(pdata->dcdc); int id = pdev->id % ARRAY_SIZE(pdata->dcdc);
struct wm831x_dcdc *dcdc; struct wm831x_dcdc *dcdc;
@ -880,7 +880,7 @@ static struct regulator_ops wm831x_epe_ops = {
static int wm831x_epe_probe(struct platform_device *pdev) static int wm831x_epe_probe(struct platform_device *pdev)
{ {
struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent); struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
struct wm831x_pdata *pdata = wm831x->dev->platform_data; struct wm831x_pdata *pdata = dev_get_platdata(wm831x->dev);
struct regulator_config config = { }; struct regulator_config config = { };
int id = pdev->id % ARRAY_SIZE(pdata->epe); int id = pdev->id % ARRAY_SIZE(pdata->epe);
struct wm831x_dcdc *dcdc; struct wm831x_dcdc *dcdc;

2
drivers/regulator/wm831x-isink.c
View File

@ -151,7 +151,7 @@ static irqreturn_t wm831x_isink_irq(int irq, void *data)
static int wm831x_isink_probe(struct platform_device *pdev) static int wm831x_isink_probe(struct platform_device *pdev)
{ {
struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent); struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
struct wm831x_pdata *pdata = wm831x->dev->platform_data; struct wm831x_pdata *pdata = dev_get_platdata(wm831x->dev);
struct wm831x_isink *isink; struct wm831x_isink *isink;
int id = pdev->id % ARRAY_SIZE(pdata->isink); int id = pdev->id % ARRAY_SIZE(pdata->isink);
struct regulator_config config = { }; struct regulator_config config = { };

6
drivers/regulator/wm831x-ldo.c
View File

@ -221,7 +221,7 @@ static struct regulator_ops wm831x_gp_ldo_ops = {
static int wm831x_gp_ldo_probe(struct platform_device *pdev) static int wm831x_gp_ldo_probe(struct platform_device *pdev)
{ {
struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent); struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
struct wm831x_pdata *pdata = wm831x->dev->platform_data; struct wm831x_pdata *pdata = dev_get_platdata(wm831x->dev);
struct regulator_config config = { }; struct regulator_config config = { };
int id; int id;
struct wm831x_ldo *ldo; struct wm831x_ldo *ldo;
@ -447,7 +447,7 @@ static struct regulator_ops wm831x_aldo_ops = {
static int wm831x_aldo_probe(struct platform_device *pdev) static int wm831x_aldo_probe(struct platform_device *pdev)
{ {
struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent); struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
struct wm831x_pdata *pdata = wm831x->dev->platform_data; struct wm831x_pdata *pdata = dev_get_platdata(wm831x->dev);
struct regulator_config config = { }; struct regulator_config config = { };
int id; int id;
struct wm831x_ldo *ldo; struct wm831x_ldo *ldo;
@ -605,7 +605,7 @@ static struct regulator_ops wm831x_alive_ldo_ops = {
static int wm831x_alive_ldo_probe(struct platform_device *pdev) static int wm831x_alive_ldo_probe(struct platform_device *pdev)
{ {
struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent); struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
struct wm831x_pdata *pdata = wm831x->dev->platform_data; struct wm831x_pdata *pdata = dev_get_platdata(wm831x->dev);
struct regulator_config config = { }; struct regulator_config config = { };
int id; int id;
struct wm831x_ldo *ldo; struct wm831x_ldo *ldo;

2
drivers/regulator/wm8350-regulator.c
View File

@ -1201,7 +1201,7 @@ static int wm8350_regulator_probe(struct platform_device *pdev)
} }
config.dev = &pdev->dev; config.dev = &pdev->dev;
config.init_data = pdev->dev.platform_data; config.init_data = dev_get_platdata(&pdev->dev);
config.driver_data = dev_get_drvdata(&pdev->dev); config.driver_data = dev_get_drvdata(&pdev->dev);
config.regmap = wm8350->regmap; config.regmap = wm8350->regmap;

2
drivers/regulator/wm8400-regulator.c
View File

@ -215,7 +215,7 @@ static int wm8400_regulator_probe(struct platform_device *pdev)
struct regulator_dev *rdev; struct regulator_dev *rdev;
config.dev = &pdev->dev; config.dev = &pdev->dev;
config.init_data = pdev->dev.platform_data; config.init_data = dev_get_platdata(&pdev->dev);
config.driver_data = wm8400; config.driver_data = wm8400;
config.regmap = wm8400->regmap; config.regmap = wm8400->regmap;

2
drivers/regulator/wm8994-regulator.c
View File

@ -125,7 +125,7 @@ static const struct regulator_init_data wm8994_ldo_default[] = {
static int wm8994_ldo_probe(struct platform_device *pdev) static int wm8994_ldo_probe(struct platform_device *pdev)
{ {
struct wm8994 *wm8994 = dev_get_drvdata(pdev->dev.parent); struct wm8994 *wm8994 = dev_get_drvdata(pdev->dev.parent);
struct wm8994_pdata *pdata = wm8994->dev->platform_data; struct wm8994_pdata *pdata = dev_get_platdata(wm8994->dev);
int id = pdev->id % ARRAY_SIZE(pdata->ldo); int id = pdev->id % ARRAY_SIZE(pdata->ldo);
struct regulator_config config = { }; struct regulator_config config = { };
struct wm8994_ldo *ldo; struct wm8994_ldo *ldo;