[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20130423184332.GA31374@avionic-0098.mockup.avionic-design.de>
Date: Tue, 23 Apr 2013 20:43:32 +0200
From: Thierry Reding <thierry.reding@...onic-design.de>
To: Bibek Basu <bbasu@...dia.com>
Cc: linus.walleij@...aro.org, swarren@...dotorg.org,
linux-tegra@...r.kernel.org, linux-kernel@...r.kernel.org,
Pritesh Raithatha <praithatha@...dia.com>
Subject: Re: [PATCH 1/2] pinctrl: tegra: add suspend-resume support
> diff --git a/drivers/pinctrl/pinctrl-tegra.c b/drivers/pinctrl/pinctrl-tegra.c
[...]
> @@ -41,6 +42,8 @@ struct tegra_pmx {
>
> int nbanks;
> void __iomem **regs;
> + int *regs_size;
Perhaps this should be unsigned int *. The values stored in this array
will never be negative, right?
> int tegra_pinctrl_probe(struct platform_device *pdev,
> const struct tegra_pinctrl_soc_data *soc_data)
> {
> - struct tegra_pmx *pmx;
> struct resource *res;
> - int i;
> + struct tegra_pmx *pmx;
> + int i, pg_data_size = 0;
There's a needless move of the pmx variable declaration here.
> @@ -735,6 +769,21 @@ int tegra_pinctrl_probe(struct platform_device *pdev,
> return -ENODEV;
> }
>
> +if (IS_ENABLED(CONFIG_PM_SLEEP))
> + pmx->regs_size = devm_kzalloc(&pdev->dev,
> + pmx->nbanks * sizeof(*(pmx->regs_size)),
> + GFP_KERNEL);
> + if (!pmx->regs_size) {
> + dev_err(&pdev->dev, "Can't alloc regs pointer\n");
> + return -ENODEV;
> + }
> +
> + pmx->pg_data = devm_kzalloc(&pdev->dev, pg_data_size, GFP_KERNEL);
> + if (!pmx->pg_data) {
> + dev_err(&pdev->dev, "Can't alloc pingroup data pointer\n");
> + return -ENODEV;
> + }
I don't think this works the way you expect it to. The line
if (IS_ENABLED(CONFIG_PM_SLEEP))
is a standard conditional and therefore needs to be properly indented
and use { and } to delimit the block.
> @@ -756,6 +805,9 @@ int tegra_pinctrl_probe(struct platform_device *pdev,
> dev_err(&pdev->dev, "Couldn't ioremap regs %d\n", i);
> return -ENODEV;
> }
> +
> +if (IS_ENABLED(CONFIG_PM_SLEEP))
> + pmx->regs_size[i] = resource_size(res);
In this case it will actually work as expected, but the if () should be
properly indented.
Thierry
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists