| Message ID | 77f543046d4d5c19206f829ddcf8e093d3e3f6da.1725440917.git.geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | pinctrl: k210: Make (p)clk local to k210_fpioa_probe() | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/vmtest-fixes-PR | fail | merge-conflict |
On 2024/09/04 18:08, Geert Uytterhoeven wrote: > There were never any users of k210_fpioa_data.clk and > k210_fpioa_data.pclk outside k210_fpioa_probe(). > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Looks OK to me. Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
On Wed, Sep 4, 2024 at 11:08 AM Geert Uytterhoeven <geert+renesas@glider.be> wrote: > There were never any users of k210_fpioa_data.clk and > k210_fpioa_data.pclk outside k210_fpioa_probe(). > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Patch applied! Yours, Linus Walleij
diff --git a/drivers/pinctrl/pinctrl-k210.c b/drivers/pinctrl/pinctrl-k210.c index 0f6b55fec31de700..caf20215aaba5e9b 100644 --- a/drivers/pinctrl/pinctrl-k210.c +++ b/drivers/pinctrl/pinctrl-k210.c @@ -96,8 +96,6 @@ struct k210_fpioa_data { struct k210_fpioa __iomem *fpioa; struct regmap *sysctl_map; u32 power_offset; - struct clk *clk; - struct clk *pclk; }; #define K210_PIN_NAME(i) ("IO_" #i) @@ -925,6 +923,7 @@ static int k210_fpioa_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; struct k210_fpioa_data *pdata; + struct clk *clk, *pclk; dev_info(dev, "K210 FPIOA pin controller\n"); @@ -939,13 +938,13 @@ static int k210_fpioa_probe(struct platform_device *pdev) if (IS_ERR(pdata->fpioa)) return PTR_ERR(pdata->fpioa); - pdata->clk = devm_clk_get_enabled(dev, "ref"); - if (IS_ERR(pdata->clk)) - return PTR_ERR(pdata->clk); + clk = devm_clk_get_enabled(dev, "ref"); + if (IS_ERR(clk)) + return PTR_ERR(clk); - pdata->pclk = devm_clk_get_optional_enabled(dev, "pclk"); - if (IS_ERR(pdata->pclk)) - return PTR_ERR(pdata->pclk); + pclk = devm_clk_get_optional_enabled(dev, "pclk"); + if (IS_ERR(pclk)) + return PTR_ERR(pclk); pdata->sysctl_map = syscon_regmap_lookup_by_phandle_args(np,
There were never any users of k210_fpioa_data.clk and k210_fpioa_data.pclk outside k210_fpioa_probe(). Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- drivers/pinctrl/pinctrl-k210.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)