lkml.org 
[lkml]   [2012]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 3/3] regulator: Fix build error for mc13783 and mc13892
    From
    Date
    Convert mc13783 and mc13892 to use a struct to pass in regulator runtime
    configuration.

    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    ---
    drivers/regulator/mc13783-regulator.c | 12 +++++++++---
    drivers/regulator/mc13892-regulator.c | 8 ++++++--
    2 files changed, 15 insertions(+), 5 deletions(-)

    diff --git a/drivers/regulator/mc13783-regulator.c b/drivers/regulator/mc13783-regulator.c
    index 6c0face..7dcdfa2 100644
    --- a/drivers/regulator/mc13783-regulator.c
    +++ b/drivers/regulator/mc13783-regulator.c
    @@ -340,6 +340,7 @@ static int __devinit mc13783_regulator_probe(struct platform_device *pdev)
    struct mc13xxx_regulator_platform_data *pdata =
    dev_get_platdata(&pdev->dev);
    struct mc13xxx_regulator_init_data *init_data;
    + struct regulator_config config = { };
    int i, ret;

    dev_dbg(&pdev->dev, "%s id %d\n", __func__, pdev->id);
    @@ -357,11 +358,16 @@ static int __devinit mc13783_regulator_probe(struct platform_device *pdev)
    priv->mc13xxx = mc13783;

    for (i = 0; i < pdata->num_regulators; i++) {
    + struct regulator_desc *desc;
    +
    init_data = &pdata->regulators[i];
    - priv->regulators[i] = regulator_register(
    - &mc13783_regulators[init_data->id].desc,
    - &pdev->dev, init_data->init_data, priv, NULL);
    + desc = &mc13783_regulators[init_data->id].desc;
    +
    + config.dev = &pdev->dev;
    + config.init_data = init_data->init_data;
    + config.driver_data = priv;

    + priv->regulators[i] = regulator_register(desc, &config);
    if (IS_ERR(priv->regulators[i])) {
    dev_err(&pdev->dev, "failed to register regulator %s\n",
    mc13783_regulators[i].desc.name);
    diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
    index 8830807..970a233 100644
    --- a/drivers/regulator/mc13892-regulator.c
    +++ b/drivers/regulator/mc13892-regulator.c
    @@ -519,6 +519,7 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev)
    struct mc13xxx_regulator_platform_data *pdata =
    dev_get_platdata(&pdev->dev);
    struct mc13xxx_regulator_init_data *mc13xxx_data;
    + struct regulator_config config = { };
    int i, ret;
    int num_regulators = 0;
    u32 val;
    @@ -588,9 +589,12 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev)
    }
    desc = &mc13892_regulators[id].desc;

    - priv->regulators[i] = regulator_register(
    - desc, &pdev->dev, init_data, priv, node);
    + config.dev = &pdev->dev;
    + config.init_data = init_data;
    + config.driver_data = priv;
    + config.of_node = node;

    + priv->regulators[i] = regulator_register(desc, &config);
    if (IS_ERR(priv->regulators[i])) {
    dev_err(&pdev->dev, "failed to register regulator %s\n",
    mc13892_regulators[i].desc.name);
    --
    1.7.5.4




    \
     
     \ /
      Last update: 2012-04-10 07:53    [W:0.024 / U:90.604 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site