diff options
| author | Joel Stanley <joel@jms.id.au> | 2022-02-17 13:39:23 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2022-02-17 13:39:32 +0300 |
| commit | 2befcc6bb0bb1e0a4a31391a359adcab3925b6e4 (patch) | |
| tree | acc6a7f8231c44844aac6c304e79c6d2de0a601a /drivers/soc | |
| parent | fb55a38ae174af9f4ae45d9933dc9503356cfc38 (diff) | |
| parent | a0ebea480bb319a3ad408c99db91262dbc696b76 (diff) | |
| download | linux-2befcc6bb0bb1e0a4a31391a359adcab3925b6e4.tar.xz | |
Merge tag 'v5.15.24' into dev-5.15
This is the 5.15.24 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/mediatek/mtk-scpsys.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/soc/mediatek/mtk-scpsys.c b/drivers/soc/mediatek/mtk-scpsys.c index 670cc82d17dc..ca75b14931ec 100644 --- a/drivers/soc/mediatek/mtk-scpsys.c +++ b/drivers/soc/mediatek/mtk-scpsys.c @@ -411,17 +411,12 @@ out: return ret; } -static int init_clks(struct platform_device *pdev, struct clk **clk) +static void init_clks(struct platform_device *pdev, struct clk **clk) { int i; - for (i = CLK_NONE + 1; i < CLK_MAX; i++) { + for (i = CLK_NONE + 1; i < CLK_MAX; i++) clk[i] = devm_clk_get(&pdev->dev, clk_names[i]); - if (IS_ERR(clk[i])) - return PTR_ERR(clk[i]); - } - - return 0; } static struct scp *init_scp(struct platform_device *pdev, @@ -431,7 +426,7 @@ static struct scp *init_scp(struct platform_device *pdev, { struct genpd_onecell_data *pd_data; struct resource *res; - int i, j, ret; + int i, j; struct scp *scp; struct clk *clk[CLK_MAX]; @@ -486,9 +481,7 @@ static struct scp *init_scp(struct platform_device *pdev, pd_data->num_domains = num; - ret = init_clks(pdev, clk); - if (ret) - return ERR_PTR(ret); + init_clks(pdev, clk); for (i = 0; i < num; i++) { struct scp_domain *scpd = &scp->domains[i]; |