Unverified Commit fd811b62 authored by Mark Brown's avatar Mark Brown
Browse files

spi: Use devm_clk_get_*() helper function to 

Merge series from Li Zetao <lizetao1@huawei.com>:

Commit 7ef9651e ("clk: Provide new devm_clk helpers for prepared
and enabled clocks") provides a new helper function for prepared and
enabled clocks when a driver keeps a clock prepared (or enabled) during
the whole lifetime of the driver. So where drivers get clocks and enable
them immediately, it can be combined into a single function
devm_clk_get_*(). Moreover, the unprepare and disable function
has been registered to devm_clk_state, and before devm_clk_state is
released, the clocks will be unprepareed and disable, so it is unnecessary
to unprepare and disable clocks explicitly when remove drivers or in the
error handling path.
parents fffae3af d6c612a3

drivers/spi/spi-ar934x.c

+3 −19
Original line number Diff line number Diff line
@@ -168,27 +168,21 @@ static int ar934x_spi_probe(struct platform_device *pdev) 
	struct ar934x_spi *sp;

	void __iomem *base;

	struct clk *clk;

	int ret;



	base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(base))

		return PTR_ERR(base);



	clk = devm_clk_get(&pdev->dev, NULL);

	clk = devm_clk_get_enabled(&pdev->dev, NULL);

	if (IS_ERR(clk)) {

		dev_err(&pdev->dev, "failed to get clock\n");

		return PTR_ERR(clk);

	}



	ret = clk_prepare_enable(clk);

	if (ret)

		return ret;



	ctlr = devm_spi_alloc_host(&pdev->dev, sizeof(*sp));

	if (!ctlr) {

		dev_info(&pdev->dev, "failed to allocate spi controller\n");

		ret = -ENOMEM;

		goto err_clk_disable;

		return -ENOMEM;

	}



	/* disable flash mapping and expose spi controller registers */
@@ -212,25 +206,15 @@ static int ar934x_spi_probe(struct platform_device *pdev) 
	sp->clk_freq = clk_get_rate(clk);

	sp->ctlr = ctlr;



	ret = spi_register_controller(ctlr);

	if (!ret)

		return 0;



err_clk_disable:

	clk_disable_unprepare(clk);

	return ret;

	return spi_register_controller(ctlr);

}



static void ar934x_spi_remove(struct platform_device *pdev)

{

	struct spi_controller *ctlr;

	struct ar934x_spi *sp;



	ctlr = dev_get_drvdata(&pdev->dev);

	sp = spi_controller_get_devdata(ctlr);



	spi_unregister_controller(ctlr);

	clk_disable_unprepare(sp->clk);

}



static struct platform_driver ar934x_spi_driver = {

drivers/spi/spi-armada-3700.c

+3 −20
Original line number Diff line number Diff line
@@ -865,18 +865,12 @@ static int a3700_spi_probe(struct platform_device *pdev) 


	init_completion(&spi->done);



	spi->clk = devm_clk_get(dev, NULL);

	spi->clk = devm_clk_get_prepared(dev, NULL);

	if (IS_ERR(spi->clk)) {

		dev_err(dev, "could not find clk: %ld\n", PTR_ERR(spi->clk));

		goto error;

	}



	ret = clk_prepare(spi->clk);

	if (ret) {

		dev_err(dev, "could not prepare clk: %d\n", ret);

		goto error;

	}



	host->max_speed_hz = min_t(unsigned long, A3700_SPI_MAX_SPEED_HZ,

					clk_get_rate(spi->clk));

	host->min_speed_hz = DIV_ROUND_UP(clk_get_rate(spi->clk),
@@ -888,40 +882,29 @@ static int a3700_spi_probe(struct platform_device *pdev) 
			       dev_name(dev), host);

	if (ret) {

		dev_err(dev, "could not request IRQ: %d\n", ret);

		goto error_clk;

		goto error;

	}



	ret = devm_spi_register_controller(dev, host);

	if (ret) {

		dev_err(dev, "Failed to register host\n");

		goto error_clk;

		goto error;

	}



	return 0;



error_clk:

	clk_unprepare(spi->clk);

error:

	spi_controller_put(host);

out:

	return ret;

}



static void a3700_spi_remove(struct platform_device *pdev)

{

	struct spi_controller *host = platform_get_drvdata(pdev);

	struct a3700_spi *spi = spi_controller_get_devdata(host);



	clk_unprepare(spi->clk);

}



static struct platform_driver a3700_spi_driver = {

	.driver = {

		.name	= DRIVER_NAME,

		.of_match_table = of_match_ptr(a3700_spi_dt_ids),

	},

	.probe		= a3700_spi_probe,

	.remove_new	= a3700_spi_remove,

};



module_platform_driver(a3700_spi_driver);

drivers/spi/spi-aspeed-smc.c

+2 −14
Original line number Diff line number Diff line
@@ -748,7 +748,7 @@ static int aspeed_spi_probe(struct platform_device *pdev) 
	aspi->ahb_window_size = resource_size(res);

	aspi->ahb_base_phy = res->start;



	aspi->clk = devm_clk_get(&pdev->dev, NULL);

	aspi->clk = devm_clk_get_enabled(&pdev->dev, NULL);

	if (IS_ERR(aspi->clk)) {

		dev_err(dev, "missing clock\n");

		return PTR_ERR(aspi->clk);
@@ -760,12 +760,6 @@ static int aspeed_spi_probe(struct platform_device *pdev) 
		return -EINVAL;

	}



	ret = clk_prepare_enable(aspi->clk);

	if (ret) {

		dev_err(dev, "can not enable the clock\n");

		return ret;

	}



	/* IRQ is for DMA, which the driver doesn't support yet */



	ctlr->mode_bits = SPI_RX_DUAL | SPI_TX_DUAL | data->mode_bits;
@@ -777,14 +771,9 @@ static int aspeed_spi_probe(struct platform_device *pdev) 
	ctlr->dev.of_node = dev->of_node;



	ret = devm_spi_register_controller(dev, ctlr);

	if (ret) {

	if (ret)

		dev_err(&pdev->dev, "spi_register_controller failed\n");

		goto disable_clk;

	}

	return 0;



disable_clk:

	clk_disable_unprepare(aspi->clk);

	return ret;

}
@@ -793,7 +782,6 @@ static void aspeed_spi_remove(struct platform_device *pdev) 
	struct aspeed_spi *aspi = platform_get_drvdata(pdev);



	aspeed_spi_enable(aspi, false);

	clk_disable_unprepare(aspi->clk);

}



/*

drivers/spi/spi-ath79.c

+2 −9
Original line number Diff line number Diff line
@@ -200,20 +200,16 @@ static int ath79_spi_probe(struct platform_device *pdev) 
		goto err_put_host;

	}



	sp->clk = devm_clk_get(&pdev->dev, "ahb");

	sp->clk = devm_clk_get_enabled(&pdev->dev, "ahb");

	if (IS_ERR(sp->clk)) {

		ret = PTR_ERR(sp->clk);

		goto err_put_host;

	}



	ret = clk_prepare_enable(sp->clk);

	if (ret)

		goto err_put_host;



	rate = DIV_ROUND_UP(clk_get_rate(sp->clk), MHZ);

	if (!rate) {

		ret = -EINVAL;

		goto err_clk_disable;

		goto err_put_host;

	}



	sp->rrw_delay = ATH79_SPI_RRW_DELAY_FACTOR / rate;
@@ -229,8 +225,6 @@ static int ath79_spi_probe(struct platform_device *pdev) 


err_disable:

	ath79_spi_disable(sp);

err_clk_disable:

	clk_disable_unprepare(sp->clk);

err_put_host:

	spi_controller_put(host);
@@ -243,7 +237,6 @@ static void ath79_spi_remove(struct platform_device *pdev) 


	spi_bitbang_stop(&sp->bitbang);

	ath79_spi_disable(sp);

	clk_disable_unprepare(sp->clk);

	spi_controller_put(sp->bitbang.master);

}

drivers/spi/spi-axi-spi-engine.c

+5 −20
Original line number Diff line number Diff line
@@ -485,30 +485,22 @@ static int spi_engine_probe(struct platform_device *pdev) 


	spin_lock_init(&spi_engine->lock);



	spi_engine->clk = devm_clk_get(&pdev->dev, "s_axi_aclk");

	spi_engine->clk = devm_clk_get_enabled(&pdev->dev, "s_axi_aclk");

	if (IS_ERR(spi_engine->clk)) {

		ret = PTR_ERR(spi_engine->clk);

		goto err_put_host;

	}



	spi_engine->ref_clk = devm_clk_get(&pdev->dev, "spi_clk");

	spi_engine->ref_clk = devm_clk_get_enabled(&pdev->dev, "spi_clk");

	if (IS_ERR(spi_engine->ref_clk)) {

		ret = PTR_ERR(spi_engine->ref_clk);

		goto err_put_host;

	}



	ret = clk_prepare_enable(spi_engine->clk);

	if (ret)

		goto err_put_host;



	ret = clk_prepare_enable(spi_engine->ref_clk);

	if (ret)

		goto err_clk_disable;



	spi_engine->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(spi_engine->base)) {

		ret = PTR_ERR(spi_engine->base);

		goto err_ref_clk_disable;

		goto err_put_host;

	}



	version = readl(spi_engine->base + SPI_ENGINE_REG_VERSION);
@@ -518,7 +510,7 @@ static int spi_engine_probe(struct platform_device *pdev) 
			SPI_ENGINE_VERSION_MINOR(version),

			SPI_ENGINE_VERSION_PATCH(version));

		ret = -ENODEV;

		goto err_ref_clk_disable;

		goto err_put_host;

	}



	writel_relaxed(0x00, spi_engine->base + SPI_ENGINE_REG_RESET);
@@ -527,7 +519,7 @@ static int spi_engine_probe(struct platform_device *pdev) 


	ret = request_irq(irq, spi_engine_irq, 0, pdev->name, host);

	if (ret)

		goto err_ref_clk_disable;

		goto err_put_host;



	host->dev.of_node = pdev->dev.of_node;

	host->mode_bits = SPI_CPOL | SPI_CPHA | SPI_3WIRE;
@@ -545,10 +537,6 @@ static int spi_engine_probe(struct platform_device *pdev) 
	return 0;

err_free_irq:

	free_irq(irq, host);

err_ref_clk_disable:

	clk_disable_unprepare(spi_engine->ref_clk);

err_clk_disable:

	clk_disable_unprepare(spi_engine->clk);

err_put_host:

	spi_controller_put(host);

	return ret;
@@ -569,9 +557,6 @@ static void spi_engine_remove(struct platform_device *pdev) 
	writel_relaxed(0xff, spi_engine->base + SPI_ENGINE_REG_INT_PENDING);

	writel_relaxed(0x00, spi_engine->base + SPI_ENGINE_REG_INT_ENABLE);

	writel_relaxed(0x01, spi_engine->base + SPI_ENGINE_REG_RESET);



	clk_disable_unprepare(spi_engine->ref_clk);

	clk_disable_unprepare(spi_engine->clk);

}



static const struct of_device_id spi_engine_match_table[] = {