Unverified Commit 98ac85a0 authored by Jerome Brunet's avatar Jerome Brunet Committed by Mark Brown
Browse files

ASoC: meson: aiu: fix function pointer type mismatch 



clang-16 warns about casting functions to incompatible types, as is done
here to call clk_disable_unprepare:

sound/soc/meson/aiu.c:243:12: error: cast from 'void (*)(struct clk *)' to 'void (*)(void *)' converts to incompatible function type [-Werror,-Wcast-function-type-strict]
  243 |                                        (void(*)(void *))clk_disable_unprepare,

The pattern of getting, enabling and setting a disable callback for a
clock can be replaced with devm_clk_get_enabled(), which also fixes
this warning.

Fixes: 6ae9ca9c ("ASoC: meson: aiu: add i2s and spdif support")
Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Reviewed-by: default avatarJustin Stitt <justinstitt@google.com>
Link: https://msgid.link/r/20240213215807.3326688-2-jbrunet@baylibre.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e49676a5

sound/soc/meson/aiu.c

+4 −15
Original line number Diff line number Diff line
@@ -212,11 +212,12 @@ static const char * const aiu_spdif_ids[] = { 
static int aiu_clk_get(struct device *dev)

{

	struct aiu *aiu = dev_get_drvdata(dev);

	struct clk *pclk;

	int ret;



	aiu->pclk = devm_clk_get(dev, "pclk");

	if (IS_ERR(aiu->pclk))

		return dev_err_probe(dev, PTR_ERR(aiu->pclk), "Can't get the aiu pclk\n");

	pclk = devm_clk_get_enabled(dev, "pclk");

	if (IS_ERR(pclk))

		return dev_err_probe(dev, PTR_ERR(pclk), "Can't get the aiu pclk\n");



	aiu->spdif_mclk = devm_clk_get(dev, "spdif_mclk");

	if (IS_ERR(aiu->spdif_mclk))
@@ -233,18 +234,6 @@ static int aiu_clk_get(struct device *dev) 
	if (ret)

		return dev_err_probe(dev, ret, "Can't get the spdif clocks\n");



	ret = clk_prepare_enable(aiu->pclk);

	if (ret) {

		dev_err(dev, "peripheral clock enable failed\n");

		return ret;

	}



	ret = devm_add_action_or_reset(dev,

				       (void(*)(void *))clk_disable_unprepare,

				       aiu->pclk);

	if (ret)

		dev_err(dev, "failed to add reset action on pclk");



	return ret;

}

sound/soc/meson/aiu.h

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ struct aiu_platform_data { 
};



struct aiu {

	struct clk *pclk;

	struct clk *spdif_mclk;

	struct aiu_interface i2s;

	struct aiu_interface spdif;