Skip to content

Commit ff9a785

Browse files
nehebbroonie
authored andcommitted
spi: rb4xx: use devm for clk_prepare_enable
Remove the remove function as it no longer does anything useful. Also remove platform_set_drvdata as get becomes completely unused. Signed-off-by: Rosen Penev <rosenp@gmail.com> Message-ID: <20250826212413.15065-4-rosenp@gmail.com> Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent f18f0ac commit ff9a785

1 file changed

Lines changed: 1 addition & 14 deletions

File tree

drivers/spi/spi-rb4xx.c

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ static int rb4xx_spi_probe(struct platform_device *pdev)
156156
if (!host)
157157
return -ENOMEM;
158158

159-
ahb_clk = devm_clk_get(&pdev->dev, "ahb");
159+
ahb_clk = devm_clk_get_enabled(&pdev->dev, "ahb");
160160
if (IS_ERR(ahb_clk))
161161
return PTR_ERR(ahb_clk);
162162

@@ -172,31 +172,19 @@ static int rb4xx_spi_probe(struct platform_device *pdev)
172172
rbspi = spi_controller_get_devdata(host);
173173
rbspi->base = spi_base;
174174
rbspi->clk = ahb_clk;
175-
platform_set_drvdata(pdev, rbspi);
176175

177176
err = devm_spi_register_controller(&pdev->dev, host);
178177
if (err) {
179178
dev_err(&pdev->dev, "failed to register SPI host\n");
180179
return err;
181180
}
182181

183-
err = clk_prepare_enable(ahb_clk);
184-
if (err)
185-
return err;
186-
187182
/* Enable SPI */
188183
rb4xx_write(rbspi, AR71XX_SPI_REG_FS, AR71XX_SPI_FS_GPIO);
189184

190185
return 0;
191186
}
192187

193-
static void rb4xx_spi_remove(struct platform_device *pdev)
194-
{
195-
struct rb4xx_spi *rbspi = platform_get_drvdata(pdev);
196-
197-
clk_disable_unprepare(rbspi->clk);
198-
}
199-
200188
static const struct of_device_id rb4xx_spi_dt_match[] = {
201189
{ .compatible = "mikrotik,rb4xx-spi" },
202190
{ },
@@ -205,7 +193,6 @@ MODULE_DEVICE_TABLE(of, rb4xx_spi_dt_match);
205193

206194
static struct platform_driver rb4xx_spi_drv = {
207195
.probe = rb4xx_spi_probe,
208-
.remove = rb4xx_spi_remove,
209196
.driver = {
210197
.name = "rb4xx-spi",
211198
.of_match_table = rb4xx_spi_dt_match,

0 commit comments

Comments
 (0)