Commit 1d89fd1a authored by Claudiu Beznea's avatar Claudiu Beznea Committed by Kalle Valo
Browse files

wilc1000: use devm_clk_get_optional() 



Use devm_clk_get_optional() for rtc clock: it simplifies a bit
the code.

Signed-off-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210806081229.721731-4-claudiu.beznea@microchip.com
parent f36a0ee5

drivers/net/wireless/microchip/wilc1000/sdio.c

+6 −8
Original line number Diff line number Diff line
@@ -146,11 +146,11 @@ static int wilc_sdio_probe(struct sdio_func *func, 
	wilc->bus_data = sdio_priv;

	wilc->dev = &func->dev;



	wilc->rtc_clk = devm_clk_get(&func->card->dev, "rtc");

	if (PTR_ERR_OR_ZERO(wilc->rtc_clk) == -EPROBE_DEFER) {

		ret = -EPROBE_DEFER;

	wilc->rtc_clk = devm_clk_get_optional(&func->card->dev, "rtc");

	if (IS_ERR(wilc->rtc_clk)) {

		ret = PTR_ERR(wilc->rtc_clk);

		goto dispose_irq;

	} else if (!IS_ERR(wilc->rtc_clk))

	}

	clk_prepare_enable(wilc->rtc_clk);



	dev_info(&func->dev, "Driver Initializing success\n");
@@ -168,9 +168,7 @@ static void wilc_sdio_remove(struct sdio_func *func) 
{

	struct wilc *wilc = sdio_get_drvdata(func);



	if (!IS_ERR(wilc->rtc_clk))

	clk_disable_unprepare(wilc->rtc_clk);



	wilc_netdev_cleanup(wilc);

}

drivers/net/wireless/microchip/wilc1000/spi.c

+7 −8
Original line number Diff line number Diff line
@@ -162,11 +162,11 @@ static int wilc_bus_probe(struct spi_device *spi) 
	wilc->bus_data = spi_priv;

	wilc->dev_irq_num = spi->irq;



	wilc->rtc_clk = devm_clk_get(&spi->dev, "rtc");

	if (PTR_ERR_OR_ZERO(wilc->rtc_clk) == -EPROBE_DEFER) {

		ret = -EPROBE_DEFER;

	wilc->rtc_clk = devm_clk_get_optional(&spi->dev, "rtc");

	if (IS_ERR(wilc->rtc_clk)) {

		ret = PTR_ERR(wilc->rtc_clk);

		goto netdev_cleanup;

	} else if (!IS_ERR(wilc->rtc_clk))

	}

	clk_prepare_enable(wilc->rtc_clk);



	return 0;
@@ -182,10 +182,9 @@ static int wilc_bus_remove(struct spi_device *spi) 
{

	struct wilc *wilc = spi_get_drvdata(spi);



	if (!IS_ERR(wilc->rtc_clk))

	clk_disable_unprepare(wilc->rtc_clk);



	wilc_netdev_cleanup(wilc);



	return 0;

}