Messages in this thread Patch in this message | | | Date | Tue, 28 Aug 2012 07:18:06 -0700 | From | Stephen Warren <> | Subject | Re: [PATCH] regulator: tps6586x: register regulator even if no init data |
| |
On 08/28/2012 03:29 AM, Laxman Dewangan wrote: > Register all TPS6586x regulators even if there is no regulator > init data for platform i.e. without any user-supplied constraints.
> diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
> @@ -396,19 +396,19 @@ static struct tps6586x_platform_data *tps6586x_parse_dt(struct i2c_client *clien > for (i = 0, j = 0; i < num && j < count; i++) { > struct regulator_init_data *reg_idata; > > - if (!tps6586x_matches[i].init_data) > - continue; > - > reg_idata = tps6586x_matches[i].init_data; > devs[j].name = "tps6586x-regulator"; > devs[j].platform_data = tps6586x_matches[i].init_data; > devs[j].id = (int)tps6586x_matches[i].driver_data; > - if (devs[j].id == TPS6586X_ID_SYS) > - sys_rail_name = reg_idata->constraints.name; > > - if ((devs[j].id == TPS6586X_ID_LDO_5) || > - (devs[j].id == TPS6586X_ID_LDO_RTC)) > - reg_idata->supply_regulator = sys_rail_name; > + if (tps6586x_matches[i].init_data) {
The variable that's being used inside this block is reg_idata. Admittedly the value of that variable is tps6586x_matches[i].init_data, but I think it'd be much cleaner if the if statement checked reg_idata directly; that way, someone reading the code wouldn't have to look above to find out that reg_idata and tps6586x_matches[i].init_data are related.
> + if (devs[j].id == TPS6586X_ID_SYS) > + sys_rail_name = reg_idata->constraints.name;
In the MAX8907 patch this attempts to duplicate; if there is no init data where the user gives an explicit name, the name from the descriptor is used:
if (idata && idata->constraints.name) mbatt_rail_name = idata->constraints.name; else mbatt_rail_name = pmic->desc[i].name;
Shouldn't that same algorithm be used here?
> diff --git a/drivers/regulator/tps6586x-regulator.c b/drivers/regulator/tps6586x-regulator.c
> @@ -332,6 +332,9 @@ static int __devinit tps6586x_regulator_probe(struct platform_device *pdev) > > platform_set_drvdata(pdev, rdev); > > + if (!pdev->dev.platform_data) > + return 0; > + > return tps6586x_regulator_set_slew_rate(pdev); > }
Sorry, I don't immediately see why that's related?
| |