| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <74d0deb30901190924q4bc4d1ffu5211a161af3f5e6e@mail.gmail.com>
Date: Mon, 19 Jan 2009 18:24:50 +0100
From: "pHilipp Zabel" <philipp.zabel@...il.com>
To: "Mark Brown" <broonie@...nsource.wolfsonmicro.com>
Cc: "Liam Girdwood" <lrg@...mlogic.co.uk>, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 1/5] regulator: Pass regulator init data as explict argument when registering
On Mon, Jan 19, 2009 at 2:37 PM, Mark Brown
<broonie@...nsource.wolfsonmicro.com> wrote:
> Rather than having the regulator init data read from the platform_data
> member of the struct device that is registered for the regulator make
> the init data an explict argument passed in when registering. This
> allows drivers to use the platform data for their own purposes if they
> wish.
Good, I had a local patch that would pass bq24022_mach_info in
regulator_init_data->driver_data instead of platform_data.
Now that there is a possibility to pass platform_data, is there still
need for the driver_data field in regulator_init_data and for the
regulator_get_init_drvdata() function?
cheers
Philipp
> Signed-off-by: Mark Brown <broonie@...nsource.wolfsonmicro.com>
> ---
> drivers/regulator/bq24022.c | 2 +-
> drivers/regulator/core.c | 5 +++--
> drivers/regulator/da903x.c | 3 ++-
> drivers/regulator/pcf50633-regulator.c | 3 ++-
> drivers/regulator/wm8350-regulator.c | 2 +-
> drivers/regulator/wm8400-regulator.c | 2 +-
> include/linux/regulator/driver.h | 3 ++-
> 7 files changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/regulator/bq24022.c b/drivers/regulator/bq24022.c
> index 366565a..50129b4 100644
> --- a/drivers/regulator/bq24022.c
> +++ b/drivers/regulator/bq24022.c
> @@ -105,7 +105,7 @@ static int __init bq24022_probe(struct platform_device *pdev)
> ret = gpio_direction_output(pdata->gpio_iset2, 0);
> ret = gpio_direction_output(pdata->gpio_nce, 1);
>
> - bq24022 = regulator_register(&bq24022_desc, &pdev->dev, pdata);
> + bq24022 = regulator_register(&bq24022_desc, &pdev->dev, NULL, pdata);
> if (IS_ERR(bq24022)) {
> dev_dbg(&pdev->dev, "couldn't register regulator\n");
> ret = PTR_ERR(bq24022);
> diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
> index 0ff95c3..314997b 100644
> --- a/drivers/regulator/core.c
> +++ b/drivers/regulator/core.c
> @@ -1874,17 +1874,18 @@ static int add_regulator_attributes(struct regulator_dev *rdev)
> * regulator_register - register regulator
> * @regulator_desc: regulator to register
> * @dev: struct device for the regulator
> + * @init_data: platform provided init data, passed through by driver
> * @driver_data: private regulator data
> *
> * Called by regulator drivers to register a regulator.
> * Returns 0 on success.
> */
> struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
> - struct device *dev, void *driver_data)
> + struct device *dev, struct regulator_init_data *init_data,
> + void *driver_data)
> {
> static atomic_t regulator_no = ATOMIC_INIT(0);
> struct regulator_dev *rdev;
> - struct regulator_init_data *init_data = dev->platform_data;
> int ret, i;
>
> if (regulator_desc == NULL)
> diff --git a/drivers/regulator/da903x.c b/drivers/regulator/da903x.c
> index fe77730..72b1549 100644
> --- a/drivers/regulator/da903x.c
> +++ b/drivers/regulator/da903x.c
> @@ -471,7 +471,8 @@ static int __devinit da903x_regulator_probe(struct platform_device *pdev)
> if (ri->desc.id == DA9030_ID_LDO1 || ri->desc.id == DA9030_ID_LDO15)
> ri->desc.ops = &da9030_regulator_ldo1_15_ops;
>
> - rdev = regulator_register(&ri->desc, &pdev->dev, ri);
> + rdev = regulator_register(&ri->desc, &pdev->dev,
> + pdev->dev.platform_data, ri);
> if (IS_ERR(rdev)) {
> dev_err(&pdev->dev, "failed to register regulator %s\n",
> ri->desc.name);
> diff --git a/drivers/regulator/pcf50633-regulator.c b/drivers/regulator/pcf50633-regulator.c
> index 4cc85ec..cd761d8 100644
> --- a/drivers/regulator/pcf50633-regulator.c
> +++ b/drivers/regulator/pcf50633-regulator.c
> @@ -284,7 +284,8 @@ static int __devinit pcf50633_regulator_probe(struct platform_device *pdev)
> /* Already set by core driver */
> pcf = platform_get_drvdata(pdev);
>
> - rdev = regulator_register(®ulators[pdev->id], &pdev->dev, pcf);
> + rdev = regulator_register(®ulators[pdev->id], &pdev->dev,
> + pdev->dev.platform_data, pcf);
> if (IS_ERR(rdev))
> return PTR_ERR(rdev);
>
> diff --git a/drivers/regulator/wm8350-regulator.c b/drivers/regulator/wm8350-regulator.c
> index 5056e23..510920e 100644
> --- a/drivers/regulator/wm8350-regulator.c
> +++ b/drivers/regulator/wm8350-regulator.c
> @@ -1333,9 +1333,9 @@ static int wm8350_regulator_probe(struct platform_device *pdev)
> break;
> }
>
> -
> /* register regulator */
> rdev = regulator_register(&wm8350_reg[pdev->id], &pdev->dev,
> + pdev->dev.platform_data,
> dev_get_drvdata(&pdev->dev));
> if (IS_ERR(rdev)) {
> dev_err(&pdev->dev, "failed to register %s\n",
> diff --git a/drivers/regulator/wm8400-regulator.c b/drivers/regulator/wm8400-regulator.c
> index 56e23d4..6ed43b0 100644
> --- a/drivers/regulator/wm8400-regulator.c
> +++ b/drivers/regulator/wm8400-regulator.c
> @@ -294,7 +294,7 @@ static int __devinit wm8400_regulator_probe(struct platform_device *pdev)
> struct regulator_dev *rdev;
>
> rdev = regulator_register(®ulators[pdev->id], &pdev->dev,
> - pdev->dev.driver_data);
> + pdev->dev.platform_data, pdev->dev.driver_data);
>
> if (IS_ERR(rdev))
> return PTR_ERR(rdev);
> diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
> index 6e957aa..2254ad9 100644
> --- a/include/linux/regulator/driver.h
> +++ b/include/linux/regulator/driver.h
> @@ -138,7 +138,8 @@ struct regulator_desc {
> };
>
> struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
> - struct device *dev, void *driver_data);
> + struct device *dev, struct regulator_init_data *init_data,
> + void *driver_data);
> void regulator_unregister(struct regulator_dev *rdev);
>
> int regulator_notifier_call_chain(struct regulator_dev *rdev,
> --
> 1.5.6.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists