| Message ID | 1414422226-10948-3-git-send-email-k.kozlowski@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hello Krzysztof, On 10/27/2014 04:03 PM, Krzysztof Kozlowski wrote: > The driver is used only on Exynos4 based boards with DTS support. > Convert the driver to DTS-only version. > > Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> > --- > drivers/regulator/max77686.c | 51 +++++++++++++++++--------------------------- > 1 file changed, 19 insertions(+), 32 deletions(-) > > diff --git a/drivers/regulator/max77686.c b/drivers/regulator/max77686.c > index c6bf6f79bd2a..04af7a2b0910 100644 > --- a/drivers/regulator/max77686.c > +++ b/drivers/regulator/max77686.c I agree with the patch but shouldn't the mfd driver depends on OF if is DT-only? Best regards, Javier
On Mon, Oct 27, 2014 at 04:03:40PM +0100, Krzysztof Kozlowski wrote: > The driver is used only on Exynos4 based boards with DTS support. > Convert the driver to DTS-only version. This doesn't seem like a particularly persuasive reason honestly and if you're going to mess around with this stuff please fix it properly... > struct max77686_data { > + struct max77686_regulator_data *regulators; > + int num_regulators; > + ...the only reason for this array and the specification of the number of regulators is to make platform data easier to do... > - pdata->num_regulators = ARRAY_SIZE(regulators); > + max77686->num_regulators = ARRAY_SIZE(regulators); ...and indeed we wind up with a constant here anyway. At the very least it'd be better to pull the parsing into the registration, right now we have the code still laid out for platform data so it's hard to see it as a win in cleanup terms. If we're not translating into platform data we shouldn't need to keep this stuff around outside of the probe function. What would be even better would be to convert to use the standard DT parsing with regulators_node and of_match specified in the descriptor and then delete most of this code entirely.
On wto, 2014-10-28 at 00:37 +0000, Mark Brown wrote: > On Mon, Oct 27, 2014 at 04:03:40PM +0100, Krzysztof Kozlowski wrote: > > The driver is used only on Exynos4 based boards with DTS support. > > Convert the driver to DTS-only version. > > This doesn't seem like a particularly persuasive reason honestly and if > you're going to mess around with this stuff please fix it properly... > > > struct max77686_data { > > + struct max77686_regulator_data *regulators; > > + int num_regulators; > > + > > ...the only reason for this array and the specification of the number of > regulators is to make platform data easier to do... > > > - pdata->num_regulators = ARRAY_SIZE(regulators); > > + max77686->num_regulators = ARRAY_SIZE(regulators); > > ...and indeed we wind up with a constant here anyway. At the very least > it'd be better to pull the parsing into the registration, right now we > have the code still laid out for platform data so it's hard to see it as > a win in cleanup terms. If we're not translating into platform data we > shouldn't need to keep this stuff around outside of the probe function. > > What would be even better would be to convert to use the standard DT > parsing with regulators_node and of_match specified in the descriptor > and then delete most of this code entirely. You're right, there's a lot to clean in this driver. The only caveat is that I can't test the max77802 regulator so I refrained from doing intrusive changes to it. I'll try to clean up both drivers and make max77802 as RFT. Best regards, Krzysztof
diff --git a/drivers/regulator/max77686.c b/drivers/regulator/max77686.c index c6bf6f79bd2a..04af7a2b0910 100644 --- a/drivers/regulator/max77686.c +++ b/drivers/regulator/max77686.c @@ -82,6 +82,9 @@ enum max77686_ramp_rate { }; struct max77686_data { + struct max77686_regulator_data *regulators; + int num_regulators; + unsigned int opmode[MAX77686_REGULATORS]; }; @@ -430,9 +433,8 @@ static struct regulator_desc regulators[] = { regulator_desc_buck(9), }; -#ifdef CONFIG_OF -static int max77686_pmic_dt_parse_pdata(struct platform_device *pdev, - struct max77686_platform_data *pdata) +static int max77686_pmic_dt_parse(struct platform_device *pdev, + struct max77686_data *max77686) { struct max77686_dev *iodev = dev_get_drvdata(pdev->dev.parent); struct device_node *pmic_np, *regulators_np; @@ -447,15 +449,15 @@ static int max77686_pmic_dt_parse_pdata(struct platform_device *pdev, return -EINVAL; } - pdata->num_regulators = ARRAY_SIZE(regulators); + max77686->num_regulators = ARRAY_SIZE(regulators); rdata = devm_kzalloc(&pdev->dev, sizeof(*rdata) * - pdata->num_regulators, GFP_KERNEL); + max77686->num_regulators, GFP_KERNEL); if (!rdata) { of_node_put(regulators_np); return -ENOMEM; } - for (i = 0; i < pdata->num_regulators; i++) { + for (i = 0; i < max77686->num_regulators; i++) { rmatch.name = regulators[i].name; rmatch.init_data = NULL; rmatch.of_node = NULL; @@ -464,51 +466,36 @@ static int max77686_pmic_dt_parse_pdata(struct platform_device *pdev, rdata[i].of_node = rmatch.of_node; } - pdata->regulators = rdata; + max77686->regulators = rdata; of_node_put(regulators_np); return 0; } -#else -static int max77686_pmic_dt_parse_pdata(struct platform_device *pdev, - struct max77686_platform_data *pdata) -{ - return 0; -} -#endif /* CONFIG_OF */ static int max77686_pmic_probe(struct platform_device *pdev) { struct max77686_dev *iodev = dev_get_drvdata(pdev->dev.parent); - struct max77686_platform_data *pdata = dev_get_platdata(iodev->dev); struct max77686_data *max77686; int i, ret = 0; struct regulator_config config = { }; dev_dbg(&pdev->dev, "%s\n", __func__); - if (!pdata) { - dev_err(&pdev->dev, "no platform data found for regulator\n"); - return -ENODEV; - } + max77686 = devm_kzalloc(&pdev->dev, sizeof(struct max77686_data), + GFP_KERNEL); + if (!max77686) + return -ENOMEM; - if (iodev->dev->of_node) { - ret = max77686_pmic_dt_parse_pdata(pdev, pdata); - if (ret) - return ret; - } + ret = max77686_pmic_dt_parse(pdev, max77686); + if (ret) + return ret; - if (pdata->num_regulators != MAX77686_REGULATORS) { + if (max77686->num_regulators != MAX77686_REGULATORS) { dev_err(&pdev->dev, "Invalid initial data for regulator's initialiation\n"); return -EINVAL; } - max77686 = devm_kzalloc(&pdev->dev, sizeof(struct max77686_data), - GFP_KERNEL); - if (!max77686) - return -ENOMEM; - config.dev = &pdev->dev; config.regmap = iodev->regmap; config.driver_data = max77686; @@ -517,8 +504,8 @@ static int max77686_pmic_probe(struct platform_device *pdev) for (i = 0; i < MAX77686_REGULATORS; i++) { struct regulator_dev *rdev; - config.init_data = pdata->regulators[i].initdata; - config.of_node = pdata->regulators[i].of_node; + config.init_data = max77686->regulators[i].initdata; + config.of_node = max77686->regulators[i].of_node; max77686->opmode[i] = regulators[i].enable_mask >> max77686_get_opmode_shift(i);
The driver is used only on Exynos4 based boards with DTS support. Convert the driver to DTS-only version. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> --- drivers/regulator/max77686.c | 51 +++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 32 deletions(-)