Skip to content

Commit ce53657

Browse files
committed
memory: pl353-smc: simplify with devm_clk_get_enabled()
Use devm_clk_get_enabled() to drop clock prepare/unprepare parts and make code simpler. Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Link: https://lore.kernel.org/r/20240823-b4-cleanup-h-guard-v1-7-01668915bd55@linaro.org Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
1 parent 49ee2e8 commit ce53657

1 file changed

Lines changed: 3 additions & 33 deletions

File tree

drivers/memory/pl353-smc.c

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -75,34 +75,21 @@ static int pl353_smc_probe(struct amba_device *adev, const struct amba_id *id)
7575
const struct of_device_id *match = NULL;
7676
struct pl353_smc_data *pl353_smc;
7777
struct device_node *child;
78-
int err;
7978

8079
pl353_smc = devm_kzalloc(&adev->dev, sizeof(*pl353_smc), GFP_KERNEL);
8180
if (!pl353_smc)
8281
return -ENOMEM;
8382

84-
pl353_smc->aclk = devm_clk_get(&adev->dev, "apb_pclk");
83+
pl353_smc->aclk = devm_clk_get_enabled(&adev->dev, "apb_pclk");
8584
if (IS_ERR(pl353_smc->aclk))
8685
return dev_err_probe(&adev->dev, PTR_ERR(pl353_smc->aclk),
8786
"aclk clock not found.\n");
8887

89-
pl353_smc->memclk = devm_clk_get(&adev->dev, "memclk");
88+
pl353_smc->memclk = devm_clk_get_enabled(&adev->dev, "memclk");
9089
if (IS_ERR(pl353_smc->memclk))
9190
return dev_err_probe(&adev->dev, PTR_ERR(pl353_smc->memclk),
9291
"memclk clock not found.\n");
9392

94-
err = clk_prepare_enable(pl353_smc->aclk);
95-
if (err) {
96-
dev_err(&adev->dev, "Unable to enable AXI clock.\n");
97-
return err;
98-
}
99-
100-
err = clk_prepare_enable(pl353_smc->memclk);
101-
if (err) {
102-
dev_err(&adev->dev, "Unable to enable memory clock.\n");
103-
goto disable_axi_clk;
104-
}
105-
10693
amba_set_drvdata(adev, pl353_smc);
10794

10895
/* Find compatible children. Only a single child is supported */
@@ -115,30 +102,14 @@ static int pl353_smc_probe(struct amba_device *adev, const struct amba_id *id)
115102
break;
116103
}
117104
if (!match) {
118-
err = -ENODEV;
119105
dev_err(&adev->dev, "no matching children\n");
120-
goto disable_mem_clk;
106+
return -ENODEV;
121107
}
122108

123109
of_platform_device_create(child, NULL, &adev->dev);
124110
of_node_put(child);
125111

126112
return 0;
127-
128-
disable_mem_clk:
129-
clk_disable_unprepare(pl353_smc->memclk);
130-
disable_axi_clk:
131-
clk_disable_unprepare(pl353_smc->aclk);
132-
133-
return err;
134-
}
135-
136-
static void pl353_smc_remove(struct amba_device *adev)
137-
{
138-
struct pl353_smc_data *pl353_smc = amba_get_drvdata(adev);
139-
140-
clk_disable_unprepare(pl353_smc->memclk);
141-
clk_disable_unprepare(pl353_smc->aclk);
142113
}
143114

144115
static const struct amba_id pl353_ids[] = {
@@ -157,7 +128,6 @@ static struct amba_driver pl353_smc_driver = {
157128
},
158129
.id_table = pl353_ids,
159130
.probe = pl353_smc_probe,
160-
.remove = pl353_smc_remove,
161131
};
162132

163133
module_amba_driver(pl353_smc_driver);

0 commit comments

Comments
 (0)