Re: [PATCH 3/3] regulator: bcm590xx: Use array to save desc and *info

Matt Porter
2014-03-20T15:43:19Z

On Fri, Mar 14, 2014 at 10:00:28AM +0800, Axel Lin wrote:
> BCM590XX_NUM_REGS is known in compile time.
> Use array to save desc and *info makes the code simpler.
>
> Signed-off-by: Axel Lin <axel.lin@ingics.com>

Well, ok. It was coded for dynamic allocation because I'm starting to
work on BCM59054 support, which is similar but different. The actual
regulators are different but, due to luck, the total number is the
same between 59056 and 59054...so this can still work for the moment.
However, another 590xx part does have a different number of regulators
so I'm not sure this is worth doing when we know we'll go back to
dynamic allocation in the future.

-Matt

> ---
> drivers/regulator/bcm590xx-regulator.c | 18 ++----------------
> 1 file changed, 2 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/regulator/bcm590xx-regulator.c b/drivers/regulator/bcm590xx-regulator.c
> index ab08ca7..fe21855 100644
> --- a/drivers/regulator/bcm590xx-regulator.c
> +++ b/drivers/regulator/bcm590xx-regulator.c
> @@ -151,9 +151,9 @@ static struct bcm590xx_info bcm590xx_regs[] = {
> };
>
> struct bcm590xx_reg {
> - struct regulator_desc *desc;
> + struct regulator_desc desc[BCM590XX_NUM_REGS];
> struct bcm590xx *mfd;
> - struct bcm590xx_info **info;
> + struct bcm590xx_info *info[BCM590XX_NUM_REGS];
> };
>
> static int bcm590xx_get_vsel_register(int id)
> @@ -319,20 +319,6 @@ static int bcm590xx_probe(struct platform_device *pdev)
>
> platform_set_drvdata(pdev, pmu);
>
> - pmu->desc = devm_kzalloc(&pdev->dev, BCM590XX_NUM_REGS *
> - sizeof(struct regulator_desc), GFP_KERNEL);
> - if (!pmu->desc) {
> - dev_err(&pdev->dev, "Memory alloc fails for desc\n");
> - return -ENOMEM;
> - }
> -
> - pmu->info = devm_kzalloc(&pdev->dev, BCM590XX_NUM_REGS *
> - sizeof(struct bcm590xx_info *), GFP_KERNEL);
> - if (!pmu->info) {
> - dev_err(&pdev->dev, "Memory alloc fails for info\n");
> - return -ENOMEM;
> - }
> -
> info = bcm590xx_regs;
>
> for (i = 0; i < BCM590XX_NUM_REGS; i++, info++) {
> --
> 1.8.1.2
>
>
>