treewide: Bulk conversion to devm_clk_prepare_enable()hack/devm_cast_abuse

Signed-off-by: Marc Zyngier <maz@kernel.org>

8 files changed, 9 insertions, 85 deletions

diff --git a/drivers/char/hw_random/meson-rng.c b/drivers/char/hw_random/meson-rng.c
index e446236e81f2e..c7afa924ecce4 100644
--- a/drivers/char/hw_random/meson-rng.c
+++ b/drivers/char/hw_random/meson-rng.c
@@ -33,11 +33,6 @@ static int meson_rng_read(struct hwrng *rng, void *buf, size_t max, bool wait)
 	return sizeof(u32);
 }
 
-static void meson_rng_clk_disable(void *data)
-{
-	clk_disable_unprepare(data);
-}
-
 static int meson_rng_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
@@ -59,11 +54,7 @@ static int meson_rng_probe(struct platform_device *pdev)
 		data->core_clk = NULL;
 
 	if (data->core_clk) {
-		ret = clk_prepare_enable(data->core_clk);
-		if (ret)
-			return ret;
-		ret = devm_add_action_or_reset(dev, meson_rng_clk_disable,
-					       data->core_clk);
+		ret = devm_clk_prepare_enable(dev, data->core_clk);
 		if (ret)
 			return ret;
 	}
diff --git a/drivers/gpio/gpio-vf610.c b/drivers/gpio/gpio-vf610.c
index 58776f2d69ff8..51d5699118644 100644
--- a/drivers/gpio/gpio-vf610.c
+++ b/drivers/gpio/gpio-vf610.c
@@ -232,11 +232,6 @@ static int vf610_gpio_irq_set_wake(struct irq_data *d, u32 enable)
 	return 0;
 }
 
-static void vf610_gpio_disable_clk(void *data)
-{
-	clk_disable_unprepare(data);
-}
-
 static int vf610_gpio_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
@@ -268,11 +263,7 @@ static int vf610_gpio_probe(struct platform_device *pdev)
 	port->clk_port = devm_clk_get(dev, "port");
 	ret = PTR_ERR_OR_ZERO(port->clk_port);
 	if (!ret) {
-		ret = clk_prepare_enable(port->clk_port);
-		if (ret)
-			return ret;
-		ret = devm_add_action_or_reset(dev, vf610_gpio_disable_clk,
-					       port->clk_port);
+		ret = devm_clk_prepare_enable(dev, port->clk_port);
 		if (ret)
 			return ret;
 	} else if (ret == -EPROBE_DEFER) {
diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c b/drivers/gpu/drm/meson/meson_dw_hdmi.c
index aad75a22dc338..e3bdbb781418a 100644
--- a/drivers/gpu/drm/meson/meson_dw_hdmi.c
+++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c
@@ -944,15 +944,9 @@ static void meson_disable_regulator(void *data)
 	regulator_disable(data);
 }
 
-static void meson_disable_clk(void *data)
-{
-	clk_disable_unprepare(data);
-}
-
 static int meson_enable_clk(struct device *dev, char *name)
 {
 	struct clk *clk;
-	int ret;
 
 	clk = devm_clk_get(dev, name);
 	if (IS_ERR(clk)) {
@@ -960,11 +954,7 @@ static int meson_enable_clk(struct device *dev, char *name)
 		return PTR_ERR(clk);
 	}
 
-	ret = clk_prepare_enable(clk);
-	if (!ret)
-		ret = devm_add_action_or_reset(dev, meson_disable_clk, clk);
-
-	return ret;
+	return devm_clk_prepare_enable(dev, clk);
 }
 
 static int meson_dw_hdmi_bind(struct device *dev, struct device *master,
diff --git a/drivers/hwmon/sparx5-temp.c b/drivers/hwmon/sparx5-temp.c
index 98be48e3a22aa..fb6a12b9a45a3 100644
--- a/drivers/hwmon/sparx5-temp.c
+++ b/drivers/hwmon/sparx5-temp.c
@@ -26,13 +26,6 @@ struct s5_hwmon {
 	struct clk *clk;
 };
 
-static void s5_temp_clk_disable(void *data)
-{
-	struct clk *clk = data;
-
-	clk_disable_unprepare(clk);
-}
-
 static void s5_temp_enable(struct s5_hwmon *hwmon)
 {
 	u32 val = readl(hwmon->base + TEMP_CFG);
@@ -127,12 +120,7 @@ static int s5_temp_probe(struct platform_device *pdev)
 	if (IS_ERR(hwmon->clk))
 		return PTR_ERR(hwmon->clk);
 
-	ret = clk_prepare_enable(hwmon->clk);
-	if (ret)
-		return ret;
-
-	ret = devm_add_action_or_reset(&pdev->dev, s5_temp_clk_disable,
-				       hwmon->clk);
+	ret = devm_clk_prepare_enable(&pdev->dev, hwmon->clk);
 	if (ret)
 		return ret;
 
diff --git a/drivers/iio/imu/adis16480.c b/drivers/iio/imu/adis16480.c
index dfe86c5893254..824f9511187fe 100644
--- a/drivers/iio/imu/adis16480.c
+++ b/drivers/iio/imu/adis16480.c
@@ -1175,11 +1175,7 @@ static int adis16480_ext_clk_config(struct adis16480 *st,
 	val &= ~mask;
 	val |= mode;
 
-	ret = adis_write_reg_16(&st->adis, ADIS16480_REG_FNCTIO_CTRL, val);
-	if (ret)
-		return ret;
-
-	return clk_prepare_enable(st->ext_clk);
+	return adis_write_reg_16(&st->adis, ADIS16480_REG_FNCTIO_CTRL, val);
 }
 
 static int adis16480_get_ext_clocks(struct adis16480 *st)
@@ -1217,11 +1213,6 @@ static void adis16480_stop(void *data)
 	adis16480_stop_device(data);
 }
 
-static void adis16480_clk_disable(void *data)
-{
-	clk_disable_unprepare(data);
-}
-
 static int adis16480_probe(struct spi_device *spi)
 {
 	const struct spi_device_id *id = spi_get_device_id(spi);
@@ -1272,7 +1263,7 @@ static int adis16480_probe(struct spi_device *spi)
 		if (ret)
 			return ret;
 
-		ret = devm_add_action_or_reset(&spi->dev, adis16480_clk_disable, st->ext_clk);
+		ret = devm_clk_prepare_enable(&spi->dev, st->ext_clk);
 		if (ret)
 			return ret;
 
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 46d8510b2fe26..8fa93a67733aa 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -5136,11 +5136,6 @@ static int rtl_jumbo_max(struct rtl8169_private *tp)
 	}
 }
 
-static void rtl_disable_clk(void *data)
-{
-	clk_disable_unprepare(data);
-}
-
 static int rtl_get_ether_clk(struct rtl8169_private *tp)
 {
 	struct device *d = tp_to_dev(tp);
@@ -5157,11 +5152,9 @@ static int rtl_get_ether_clk(struct rtl8169_private *tp)
 			dev_err_probe(d, rc, "failed to get clk\n");
 	} else {
 		tp->clk = clk;
-		rc = clk_prepare_enable(clk);
+		rc = devm_clk_prepare_enable(d, clk);
 		if (rc)
 			dev_err(d, "failed to enable clk: %d\n", rc);
-		else
-			rc = devm_add_action_or_reset(d, rtl_disable_clk, clk);
 	}
 
 	return rc;
diff --git a/drivers/nvmem/jz4780-efuse.c b/drivers/nvmem/jz4780-efuse.c
index 0b01b840edd9f..0592eff954ab0 100644
--- a/drivers/nvmem/jz4780-efuse.c
+++ b/drivers/nvmem/jz4780-efuse.c
@@ -131,11 +131,6 @@ static const struct regmap_config jz4780_efuse_regmap_config = {
 	.max_register = JZ_EFUDATA(7),
 };
 
-static void clk_disable_unprepare_helper(void *clock)
-{
-	clk_disable_unprepare(clock);
-}
-
 static int jz4780_efuse_probe(struct platform_device *pdev)
 {
 	struct nvmem_device *nvmem;
@@ -165,13 +160,7 @@ static int jz4780_efuse_probe(struct platform_device *pdev)
 	if (IS_ERR(efuse->clk))
 		return PTR_ERR(efuse->clk);
 
-	ret = clk_prepare_enable(efuse->clk);
-	if (ret < 0)
-		return ret;
-
-	ret = devm_add_action_or_reset(&pdev->dev,
-				       clk_disable_unprepare_helper,
-				       efuse->clk);
+	ret = devm_clk_prepare_enable(&pdev->dev, efuse->clk);
 	if (ret < 0)
 		return ret;
 
diff --git a/sound/soc/intel/keembay/kmb_platform.c b/sound/soc/intel/keembay/kmb_platform.c
index 1c3748f33136e..7be78227bd6ec 100644
--- a/sound/soc/intel/keembay/kmb_platform.c
+++ b/sound/soc/intel/keembay/kmb_platform.c
@@ -383,11 +383,6 @@ static void kmb_i2s_stop(struct kmb_i2s_info *kmb_i2s,
 	}
 }
 
-static void kmb_disable_clk(void *clk)
-{
-	clk_disable_unprepare(clk);
-}
-
 static int kmb_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
 {
 	struct kmb_i2s_info *kmb_i2s = snd_soc_dai_get_drvdata(cpu_dai);
@@ -666,11 +661,7 @@ static int kmb_plat_dai_probe(struct platform_device *pdev)
 		return PTR_ERR(kmb_i2s->clk_apb);
 	}
 
-	ret = clk_prepare_enable(kmb_i2s->clk_apb);
-	if (ret < 0)
-		return ret;
-
-	ret = devm_add_action_or_reset(dev, kmb_disable_clk, kmb_i2s->clk_apb);
+	ret = devm_clk_prepare_enable(dev, kmb_i2s->clk_apb);
 	if (ret) {
 		dev_err(dev, "Failed to add clk_apb reset action\n");
 		return ret;