Unverified Commit 90023c6e authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: fsl: Fix sparse warning 

Merge series from Shengjiu Wang <shengjiu.wang@nxp.com>:

Fix sparse warnings in various fsl drivers.
parents 65fb8e2e 409a8652

sound/soc/fsl/fsl-asoc-card.c

+3 −2
Original line number Diff line number Diff line
@@ -537,6 +537,7 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) 
	struct device *codec_dev = NULL;

	const char *codec_dai_name;

	const char *codec_dev_name;

	u32 asrc_fmt = 0;

	u32 width;

	int ret;
@@ -829,8 +830,8 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) 
			goto asrc_fail;

		}



		ret = of_property_read_u32(asrc_np, "fsl,asrc-format",

					   &priv->asrc_format);

		ret = of_property_read_u32(asrc_np, "fsl,asrc-format", &asrc_fmt);

		priv->asrc_format = (__force snd_pcm_format_t)asrc_fmt;

		if (ret) {

			/* Fallback to old binding; translate to asrc_format */

			ret = of_property_read_u32(asrc_np, "fsl,asrc-width",

sound/soc/fsl/fsl_asrc.c

+4 −2
Original line number Diff line number Diff line
@@ -1066,6 +1066,7 @@ static int fsl_asrc_probe(struct platform_device *pdev) 
	struct resource *res;

	void __iomem *regs;

	int irq, ret, i;

	u32 asrc_fmt = 0;

	u32 map_idx;

	char tmp[16];

	u32 width;
@@ -1174,7 +1175,8 @@ static int fsl_asrc_probe(struct platform_device *pdev) 
		return ret;

	}



	ret = of_property_read_u32(np, "fsl,asrc-format", &asrc->asrc_format);

	ret = of_property_read_u32(np, "fsl,asrc-format", &asrc_fmt);

	asrc->asrc_format = (__force snd_pcm_format_t)asrc_fmt;

	if (ret) {

		ret = of_property_read_u32(np, "fsl,asrc-width", &width);

		if (ret) {
@@ -1197,7 +1199,7 @@ static int fsl_asrc_probe(struct platform_device *pdev) 
		}

	}



	if (!(FSL_ASRC_FORMATS & (1ULL << asrc->asrc_format))) {

	if (!(FSL_ASRC_FORMATS & pcm_format_to_bits(asrc->asrc_format))) {

		dev_warn(&pdev->dev, "unsupported width, use default S24_LE\n");

		asrc->asrc_format = SNDRV_PCM_FORMAT_S24_LE;

	}

sound/soc/fsl/fsl_easrc.c

+6 −3
Original line number Diff line number Diff line
@@ -476,7 +476,8 @@ static int fsl_easrc_prefilter_config(struct fsl_asrc *easrc, 
	struct fsl_asrc_pair *ctx;

	struct device *dev;

	u32 inrate, outrate, offset = 0;

	u32 in_s_rate, out_s_rate, in_s_fmt, out_s_fmt;

	u32 in_s_rate, out_s_rate;

	snd_pcm_format_t in_s_fmt, out_s_fmt;

	int ret, i;



	if (!easrc)
@@ -1874,6 +1875,7 @@ static int fsl_easrc_probe(struct platform_device *pdev) 
	struct resource *res;

	struct device_node *np;

	void __iomem *regs;

	u32 asrc_fmt = 0;

	int ret, irq;



	easrc = devm_kzalloc(dev, sizeof(*easrc), GFP_KERNEL);
@@ -1934,13 +1936,14 @@ static int fsl_easrc_probe(struct platform_device *pdev) 
		return ret;

	}



	ret = of_property_read_u32(np, "fsl,asrc-format", &easrc->asrc_format);

	ret = of_property_read_u32(np, "fsl,asrc-format", &asrc_fmt);

	easrc->asrc_format = (__force snd_pcm_format_t)asrc_fmt;

	if (ret) {

		dev_err(dev, "failed to asrc format\n");

		return ret;

	}



	if (!(FSL_EASRC_FORMATS & (1ULL << easrc->asrc_format))) {

	if (!(FSL_EASRC_FORMATS & (pcm_format_to_bits(easrc->asrc_format)))) {

		dev_warn(dev, "unsupported format, switching to S24_LE\n");

		easrc->asrc_format = SNDRV_PCM_FORMAT_S24_LE;

	}

sound/soc/fsl/fsl_easrc.h

+1 −1
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ struct fsl_easrc_io_params { 
	unsigned int access_len;

	unsigned int fifo_wtmk;

	unsigned int sample_rate;

	unsigned int sample_format;

	snd_pcm_format_t sample_format;

	unsigned int norm_rate;

};

sound/soc/fsl/fsl_sai.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static inline bool fsl_sai_dir_is_synced(struct fsl_sai *sai, int dir) 


static struct pinctrl_state *fsl_sai_get_pins_state(struct fsl_sai *sai, u32 bclk)

{

	struct pinctrl_state *state = 0;

	struct pinctrl_state *state = NULL;



	if (sai->is_pdm_mode) {

		/* DSD512@44.1kHz, DSD512@48kHz */