Skip to content

Commit 82c4fad

Browse files
Li Zetaobroonie
authored andcommitted
spi: npcm-fiu: Use helper function devm_clk_get_enabled()
Since commit 7ef9651 ("clk: Provide new devm_clk helpers for prepared and enabled clocks"), devm_clk_get() and clk_prepare_enable() can now be replaced by devm_clk_get_enabled() when driver enables (and possibly prepares) the clocks for the whole lifetime of the device. Moreover, it is no longer necessary to unprepare and disable the clocks explicitly. Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Signed-off-by: Li Zetao <lizetao1@huawei.com> Link: https://lore.kernel.org/r/20230823133938.1359106-21-lizetao1@huawei.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent a06b693 commit 82c4fad

1 file changed

Lines changed: 3 additions & 11 deletions

File tree

drivers/spi/spi-npcm-fiu.c

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,7 @@ static int npcm_fiu_probe(struct platform_device *pdev)
699699
struct spi_controller *ctrl;
700700
struct npcm_fiu_spi *fiu;
701701
void __iomem *regbase;
702-
int id, ret;
702+
int id;
703703

704704
ctrl = devm_spi_alloc_host(dev, sizeof(*fiu));
705705
if (!ctrl)
@@ -737,15 +737,14 @@ static int npcm_fiu_probe(struct platform_device *pdev)
737737

738738
fiu->res_mem = platform_get_resource_byname(pdev, IORESOURCE_MEM,
739739
"memory");
740-
fiu->clk = devm_clk_get(dev, NULL);
740+
fiu->clk = devm_clk_get_enabled(dev, NULL);
741741
if (IS_ERR(fiu->clk))
742742
return PTR_ERR(fiu->clk);
743743

744744
fiu->spix_mode = of_property_read_bool(dev->of_node,
745745
"nuvoton,spix-mode");
746746

747747
platform_set_drvdata(pdev, fiu);
748-
clk_prepare_enable(fiu->clk);
749748

750749
ctrl->mode_bits = SPI_RX_DUAL | SPI_RX_QUAD
751750
| SPI_TX_DUAL | SPI_TX_QUAD;
@@ -755,18 +754,11 @@ static int npcm_fiu_probe(struct platform_device *pdev)
755754
ctrl->num_chipselect = fiu->info->max_cs;
756755
ctrl->dev.of_node = dev->of_node;
757756

758-
ret = devm_spi_register_controller(dev, ctrl);
759-
if (ret)
760-
clk_disable_unprepare(fiu->clk);
761-
762-
return ret;
757+
return devm_spi_register_controller(dev, ctrl);
763758
}
764759

765760
static void npcm_fiu_remove(struct platform_device *pdev)
766761
{
767-
struct npcm_fiu_spi *fiu = platform_get_drvdata(pdev);
768-
769-
clk_disable_unprepare(fiu->clk);
770762
}
771763

772764
MODULE_DEVICE_TABLE(of, npcm_fiu_dt_ids);

0 commit comments

Comments
 (0)