mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 22:02:02 +00:00
ASoC: fsl_easrc: use snd_pcm_format_t type for sample_format
[ Upstream commitde27216cf2
] Fix sparse warning: sound/soc/fsl/fsl_easrc.c:562:33: sparse: warning: restricted snd_pcm_format_t degrades to integer sound/soc/fsl/fsl_easrc.c:563:34: sparse: warning: restricted snd_pcm_format_t degrades to integer sound/soc/fsl/fsl_easrc.c:565:38: sparse: warning: restricted snd_pcm_format_t degrades to integer sound/soc/fsl/fsl_easrc.c:566:39: sparse: warning: restricted snd_pcm_format_t degrades to integer sound/soc/fsl/fsl_easrc.c:608:33: sparse: warning: restricted snd_pcm_format_t degrades to integer sound/soc/fsl/fsl_easrc.c:609:34: sparse: warning: restricted snd_pcm_format_t degrades to integer sound/soc/fsl/fsl_easrc.c:615:40: sparse: warning: restricted snd_pcm_format_t degrades to integer sound/soc/fsl/fsl_easrc.c:616:41: sparse: warning: restricted snd_pcm_format_t degrades to integer sound/soc/fsl/fsl_easrc.c:1465:51: sparse: warning: incorrect type in assignment (different base types) sound/soc/fsl/fsl_easrc.c:1465:51: sparse: expected unsigned int sample_format sound/soc/fsl/fsl_easrc.c:1465:51: sparse: got restricted snd_pcm_format_t [usertype] format sound/soc/fsl/fsl_easrc.c:1467:52: sparse: warning: incorrect type in assignment (different base types) sound/soc/fsl/fsl_easrc.c:1467:52: sparse: expected unsigned int sample_format sound/soc/fsl/fsl_easrc.c:1467:52: sparse: got restricted snd_pcm_format_t [usertype] asrc_format sound/soc/fsl/fsl_easrc.c:1470:52: sparse: warning: incorrect type in assignment (different base types) sound/soc/fsl/fsl_easrc.c:1470:52: sparse: expected unsigned int sample_format sound/soc/fsl/fsl_easrc.c:1470:52: sparse: got restricted snd_pcm_format_t [usertype] format sound/soc/fsl/fsl_easrc.c:1472:51: sparse: warning: incorrect type in assignment (different base types) sound/soc/fsl/fsl_easrc.c:1472:51: sparse: expected unsigned int sample_format sound/soc/fsl/fsl_easrc.c:1472:51: sparse: got restricted snd_pcm_format_t [usertype] asrc_format sound/soc/fsl/fsl_easrc.c:1484:41: sparse: warning: incorrect type in argument 2 (different base types) sound/soc/fsl/fsl_easrc.c:1484:41: sparse: expected restricted snd_pcm_format_t [usertype] *in_raw_format sound/soc/fsl/fsl_easrc.c:1484:41: sparse: got unsigned int * sound/soc/fsl/fsl_easrc.c:1485:41: sparse: warning: incorrect type in argument 3 (different base types) sound/soc/fsl/fsl_easrc.c:1485:41: sparse: expected restricted snd_pcm_format_t [usertype] *out_raw_format sound/soc/fsl/fsl_easrc.c:1485:41: sparse: got unsigned int * sound/soc/fsl/fsl_easrc.c:1937:60: sparse: warning: incorrect type in argument 3 (different base types) sound/soc/fsl/fsl_easrc.c:1937:60: sparse: expected unsigned int [usertype] *out_value sound/soc/fsl/fsl_easrc.c:1937:60: sparse: got restricted snd_pcm_format_t * sound/soc/fsl/fsl_easrc.c:1943:49: sparse: warning: restricted snd_pcm_format_t degrades to integer Fixes:955ac62405
("ASoC: fsl_easrc: Add EASRC ASoC CPU DAI drivers") Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> Link: https://lore.kernel.org/r/1658399393-28777-5-git-send-email-shengjiu.wang@nxp.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
381ec10c0c
commit
2873a6468e
2 changed files with 7 additions and 4 deletions
|
@ -476,7 +476,8 @@ static int fsl_easrc_prefilter_config(struct fsl_asrc *easrc,
|
||||||
struct fsl_asrc_pair *ctx;
|
struct fsl_asrc_pair *ctx;
|
||||||
struct device *dev;
|
struct device *dev;
|
||||||
u32 inrate, outrate, offset = 0;
|
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;
|
int ret, i;
|
||||||
|
|
||||||
if (!easrc)
|
if (!easrc)
|
||||||
|
@ -1873,6 +1874,7 @@ static int fsl_easrc_probe(struct platform_device *pdev)
|
||||||
struct resource *res;
|
struct resource *res;
|
||||||
struct device_node *np;
|
struct device_node *np;
|
||||||
void __iomem *regs;
|
void __iomem *regs;
|
||||||
|
u32 asrc_fmt = 0;
|
||||||
int ret, irq;
|
int ret, irq;
|
||||||
|
|
||||||
easrc = devm_kzalloc(dev, sizeof(*easrc), GFP_KERNEL);
|
easrc = devm_kzalloc(dev, sizeof(*easrc), GFP_KERNEL);
|
||||||
|
@ -1933,13 +1935,14 @@ static int fsl_easrc_probe(struct platform_device *pdev)
|
||||||
return ret;
|
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) {
|
if (ret) {
|
||||||
dev_err(dev, "failed to asrc format\n");
|
dev_err(dev, "failed to asrc format\n");
|
||||||
return ret;
|
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");
|
dev_warn(dev, "unsupported format, switching to S24_LE\n");
|
||||||
easrc->asrc_format = SNDRV_PCM_FORMAT_S24_LE;
|
easrc->asrc_format = SNDRV_PCM_FORMAT_S24_LE;
|
||||||
}
|
}
|
||||||
|
|
|
@ -569,7 +569,7 @@ struct fsl_easrc_io_params {
|
||||||
unsigned int access_len;
|
unsigned int access_len;
|
||||||
unsigned int fifo_wtmk;
|
unsigned int fifo_wtmk;
|
||||||
unsigned int sample_rate;
|
unsigned int sample_rate;
|
||||||
unsigned int sample_format;
|
snd_pcm_format_t sample_format;
|
||||||
unsigned int norm_rate;
|
unsigned int norm_rate;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue