Unverified Commit 81ff296a authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: meson: aiu: fix function pointer type 

Merge series from Jerome Brunet <jbrunet@baylibre.com>:

This patchset fixes 2 -Wcast-function-type-strict warning in amlogic
audio drivers with clang 16.
parents 2775f88b 5ad992c7

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;

sound/soc/meson/t9015.c

+4 −16
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ 
#define POWER_CFG	0x10



struct t9015 {

	struct clk *pclk;

	struct regulator *avdd;

};
@@ -249,6 +248,7 @@ static int t9015_probe(struct platform_device *pdev) 
	struct t9015 *priv;

	void __iomem *regs;

	struct regmap *regmap;

	struct clk *pclk;

	int ret;



	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
@@ -256,26 +256,14 @@ static int t9015_probe(struct platform_device *pdev) 
		return -ENOMEM;

	platform_set_drvdata(pdev, priv);



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

	if (IS_ERR(priv->pclk))

		return dev_err_probe(dev, PTR_ERR(priv->pclk), "failed to get core clock\n");

	pclk = devm_clk_get_enabled(dev, "pclk");

	if (IS_ERR(pclk))

		return dev_err_probe(dev, PTR_ERR(pclk), "failed to get core clock\n");



	priv->avdd = devm_regulator_get(dev, "AVDD");

	if (IS_ERR(priv->avdd))

		return dev_err_probe(dev, PTR_ERR(priv->avdd), "failed to AVDD\n");



	ret = clk_prepare_enable(priv->pclk);

	if (ret) {

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

		return ret;

	}



	ret = devm_add_action_or_reset(dev,

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

			priv->pclk);

	if (ret)

		return ret;



	ret = device_reset(dev);

	if (ret) {

		dev_err(dev, "reset failed\n");