regulator: bd718x7: Remove double indirection for bd718xx_pmic_inits.rdatas
PATCH 1/1 regulator: bd718x7: Remove double indirection for bd718xx_pmic_inits.rdatas
With gcc 4.1:
drivers/regulator/bd718x7-regulator.c: In function ‘bd718xx_probe’:
drivers/regulator/bd718x7-regulator.c:1020: warning: initialization from incompatible pointer type drivers/regulator/bd718x7-regulator.c:1024: warning: initialization from incompatible pointer type
Apparently this old compiler can't handle the obscure double indirection.
However, there is no need for a double indirection. Just store a pointer to the array instead, like other drivers tend to do.
---
Compile-tested only.
--- drivers/regulator/bd718x7-regulator.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/regulator/bd718x7-regulator.c +4 -4
@@ -1007,7 +1007,7 @@ static const struct bd718xx_regulator_data bd71837_regulators[] = { };struct bd718xx_pmic_inits { -const struct bd718xx_regulator_data (*r_datas)[]; +const struct bd718xx_regulator_data *r_datas;unsigned int r_amount; };
@@ -1017,11 +1017,11 @@ static int bd718xx_probe(struct platform_device *pdev)struct regulator_config config = {0 };struct bd718xx_pmic_inits pmic_regulators[] = { [BD718XX_TYPE_BD71837 ] = { - .r_datas = &bd71837_regulators, + .r_datas = bd71837_regulators, .r_amount =ARRAY_SIZE (bd71837_regulators), }, [BD718XX_TYPE_BD71847 ] = { - .r_datas = &bd71847_regulators, + .r_datas = bd71847_regulators, .r_amount =ARRAY_SIZE (bd71847_regulators), }, };
@@ -1059,7 +1059,7 @@ static int bd718xx_probe(struct platform_device *pdev)struct regulator_dev *rdev;const struct bd718xx_regulator_data *r; - r = &(*pmic_regulators[mfd->chip_type].r_datas)[i]; + r = &pmic_regulators[mfd->chip_type].r_datas[i]; desc = &r->desc; config.dev = pdev->dev.parent;
Signature · 1 line
2.17.1
Quoted 8 lines · Geert Uytterhoeven
With gcc 4.1:
drivers/regulator/bd718x7-regulator.c: In function ‘bd718xx_probe’:
drivers/regulator/bd718x7-regulator.c:1020: warning: initialization from incompatible pointer typedrivers/regulator/bd718x7-regulator.c:1024: warning: initialization from incompatible pointer typeApparently this old compiler can't handle the obscure double indirection.
That was surprizing for me. Besides I don't see why this is obscure ;)
Quoted 2 lines
However, there is no need for a double indirection. Just store a pointer to the array instead, like other drivers tend to do.
But that's _exactly_ what we have here. A pointer to an array of structs, not pointer to a struct - or pointer to the first member of an array =)
But this is one of the cases where practicality should be preferred. And you are correct. It is easier to understand when we have simple pointer to a struct - and moreover it should work on all compilers, right? So this looks good to me.
Quoted 47 lines
Fixes 494edd266b945f36 ("regulator/mfd: Support ROHM BD71847 power management IC")Signed-off-by Geert Uytterhoeven <[email protected]>---
Compile-tested only.--- drivers/regulator/bd718x7-regulator.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/regulator/bd718x7-regulator.c +4
-4@@ -1007,7 +1007,7 @@ static const struct bd718xx_regulator_data bd71837_regulators[] = { };struct bd718xx_pmic_inits { -const struct bd718xx_regulator_data (*r_datas)[]; +const struct bd718xx_regulator_data *r_datas;unsigned int r_amount; };@@ -1017,11 +1017,11 @@ static int bd718xx_probe(struct platform_device *pdev)struct regulator_config config = {0 };struct bd718xx_pmic_inits pmic_regulators[] = { [BD718XX_TYPE_BD71837 ] = { - .r_datas = &bd71837_regulators, + .r_datas = bd71837_regulators, .r_amount =ARRAY_SIZE (bd71837_regulators), }, [BD718XX_TYPE_BD71847 ] = { - .r_datas = &bd71847_regulators, + .r_datas = bd71847_regulators, .r_amount =ARRAY_SIZE (bd71847_regulators), }, };@@ -1059,7 +1059,7 @@ static int bd718xx_probe(struct platform_device *pdev)struct regulator_dev *rdev;const struct bd718xx_regulator_data *r; - r = &(*pmic_regulators[mfd->chip_type].r_datas)[i]; + r = &pmic_regulators[mfd->chip_type].r_datas[i]; desc = &r->desc; config.dev = pdev->dev.parent;Signature · 1 line
2.17.1
Signature · 4 lines
Matti Vaittinen ROHM Semiconductors ~~~ "I don't think so," said Rene Descartes. Just then, he vanished ~~~