Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Rosen Penev and committed by
Mark Brown
ff9a7857 f18f0ac5

+1 -14
+1 -14
drivers/spi/spi-rb4xx.c
··· 156 156 if (!host) 157 157 return -ENOMEM; 158 158 159 - ahb_clk = devm_clk_get(&pdev->dev, "ahb"); 159 + ahb_clk = devm_clk_get_enabled(&pdev->dev, "ahb"); 160 160 if (IS_ERR(ahb_clk)) 161 161 return PTR_ERR(ahb_clk); 162 162 ··· 172 172 rbspi = spi_controller_get_devdata(host); 173 173 rbspi->base = spi_base; 174 174 rbspi->clk = ahb_clk; 175 - platform_set_drvdata(pdev, rbspi); 176 175 177 176 err = devm_spi_register_controller(&pdev->dev, host); 178 177 if (err) { ··· 179 180 return err; 180 181 } 181 182 182 - err = clk_prepare_enable(ahb_clk); 183 - if (err) 184 - return err; 185 - 186 183 /* Enable SPI */ 187 184 rb4xx_write(rbspi, AR71XX_SPI_REG_FS, AR71XX_SPI_FS_GPIO); 188 185 189 186 return 0; 190 - } 191 - 192 - static void rb4xx_spi_remove(struct platform_device *pdev) 193 - { 194 - struct rb4xx_spi *rbspi = platform_get_drvdata(pdev); 195 - 196 - clk_disable_unprepare(rbspi->clk); 197 187 } 198 188 199 189 static const struct of_device_id rb4xx_spi_dt_match[] = { ··· 193 205 194 206 static struct platform_driver rb4xx_spi_drv = { 195 207 .probe = rb4xx_spi_probe, 196 - .remove = rb4xx_spi_remove, 197 208 .driver = { 198 209 .name = "rb4xx-spi", 199 210 .of_match_table = rb4xx_spi_dt_match,