torvalds/linux
3
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-03-22 07:27:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

spi: amlogic: spifc-a4: Remove redundant clock cleanup

Browse Source 
The driver uses devm_clk_get_enabled() which enables the clock and
registers a callback to automatically disable it when the device
is unbound.

Remove the redundant aml_sfc_disable_clk() call in the error paths
and remove callback.

Fixes: 4670db6f32 ("spi: amlogic: add driver for Amlogic SPI Flash Controller")
Signed-off-by: Felix Gu <ustc.gu@gmail.com>
Link: https://patch.msgid.link/20260308-spifc-a4-1-v1-1-77e286c26832@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Felix Gu
2026-03-08 21:34:55 +08:00
committed by Mark Brown
parent f338e77383
commit a00da54d06
1 changed files with 7 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/spi/spi-amlogic-spifc-a4.c
View File

@@ -1083,14 +1083,6 @@ static int aml_sfc_clk_init(struct aml_sfc *sfc)
return clk_set_rate(sfc->core_clk, SFC_BUS_DEFAULT_CLK);
}
static int aml_sfc_disable_clk(struct aml_sfc *sfc)
{
clk_disable_unprepare(sfc->core_clk);
clk_disable_unprepare(sfc->gate_clk);
return 0;
}
static int aml_sfc_probe(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
@@ -1141,16 +1133,12 @@ static int aml_sfc_probe(struct platform_device *pdev)
/* Enable Amlogic flash controller spi mode */
ret = regmap_write(sfc->regmap_base, SFC_SPI_CFG, SPI_MODE_EN);
if (ret) {
dev_err(dev, "failed to enable SPI mode\n");
goto err_out;
}
if (ret)
return dev_err_probe(dev, ret, "failed to enable SPI mode\n");
ret = dma_set_mask(sfc->dev, DMA_BIT_MASK(32));
if (ret) {
dev_err(sfc->dev, "failed to set dma mask\n");
goto err_out;
}
if (ret)
return dev_err_probe(sfc->dev, ret, "failed to set dma mask\n");
sfc->ecc_eng.dev = &pdev->dev;
sfc->ecc_eng.integration = NAND_ECC_ENGINE_INTEGRATION_PIPELINED;
@@ -1158,10 +1146,8 @@ static int aml_sfc_probe(struct platform_device *pdev)
sfc->ecc_eng.priv = sfc;
ret = nand_ecc_register_on_host_hw_engine(&sfc->ecc_eng);
if (ret) {
dev_err(&pdev->dev, "failed to register Aml host ecc engine.\n");
goto err_out;
}
if (ret)
return dev_err_probe(&pdev->dev, ret, "failed to register Aml host ecc engine.\n");
ret = of_property_read_u32(np, "amlogic,rx-adj", &val);
if (!ret)
@@ -1177,24 +1163,7 @@ static int aml_sfc_probe(struct platform_device *pdev)
ctrl->min_speed_hz = SFC_MIN_FREQUENCY;
ctrl->num_chipselect = SFC_MAX_CS_NUM;
ret = devm_spi_register_controller(dev, ctrl);
if (ret)
goto err_out;
return 0;
err_out:
aml_sfc_disable_clk(sfc);
return ret;
}
static void aml_sfc_remove(struct platform_device *pdev)
{
struct spi_controller *ctlr = platform_get_drvdata(pdev);
struct aml_sfc *sfc = spi_controller_get_devdata(ctlr);
aml_sfc_disable_clk(sfc);
return devm_spi_register_controller(dev, ctrl);
}
static const struct of_device_id aml_sfc_of_match[] = {
@@ -1212,7 +1181,6 @@ static struct platform_driver aml_sfc_driver = {
.of_match_table = aml_sfc_of_match,
},
.probe = aml_sfc_probe,
.remove = aml_sfc_remove,
};
module_platform_driver(aml_sfc_driver);