* [PATCH 2/4] ASoC: fsl_esai: Use 'const _be *' type for iprop
2018-02-11 21:53 [PATCH 1/4] ASoC: fsl-asoc-card: Use 'snd_pcm_format_t' type when appropriate Fabio Estevam
@ 2018-02-11 21:53 ` Fabio Estevam
2018-02-12 12:52 ` Applied "ASoC: fsl_esai: Use 'const _be *' type for iprop" to the asoc tree Mark Brown
2018-02-11 21:53 ` [PATCH 3/4] ASoC: fsl_utils: Use 'const _be *' type for iprop Fabio Estevam
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Fabio Estevam @ 2018-02-11 21:53 UTC (permalink / raw)
To: broonie; +Cc: nicoleotsuka, Fabio Estevam, alsa-devel, timur
From: Fabio Estevam <fabio.estevam@nxp.com>
The 'iprop' variable is passed as an argument to the be32_to_cpup()
function, which expects a 'const _be *' type.
Change the iprop variable type so that the following build warnings
with W=1 are gone:
sound/soc/fsl/fsl_esai.c:860:54: warning: incorrect type in argument 1 (different base types)
sound/soc/fsl/fsl_esai.c:860:54: expected restricted __be32 const [usertype] *p
sound/soc/fsl/fsl_esai.c:860:54: got unsigned int const [usertype] *[assigned] iprop
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
sound/soc/fsl/fsl_esai.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c
index cef79a1..40a7004 100644
--- a/sound/soc/fsl/fsl_esai.c
+++ b/sound/soc/fsl/fsl_esai.c
@@ -788,7 +788,7 @@ static int fsl_esai_probe(struct platform_device *pdev)
struct device_node *np = pdev->dev.of_node;
struct fsl_esai *esai_priv;
struct resource *res;
- const uint32_t *iprop;
+ const __be32 *iprop;
void __iomem *regs;
int irq, ret;
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* Applied "ASoC: fsl_esai: Use 'const _be *' type for iprop" to the asoc tree
2018-02-11 21:53 ` [PATCH 2/4] ASoC: fsl_esai: Use 'const _be *' type for iprop Fabio Estevam
@ 2018-02-12 12:52 ` Mark Brown
0 siblings, 0 replies; 8+ messages in thread
From: Mark Brown @ 2018-02-12 12:52 UTC (permalink / raw)
To: Fabio Estevam; +Cc: nicoleotsuka, alsa-devel, broonie, timur
The patch
ASoC: fsl_esai: Use 'const _be *' type for iprop
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From 0600b3e101b718557c1851c4a3ff456aa18e4956 Mon Sep 17 00:00:00 2001
From: Fabio Estevam <fabio.estevam@nxp.com>
Date: Sun, 11 Feb 2018 19:53:19 -0200
Subject: [PATCH] ASoC: fsl_esai: Use 'const _be *' type for iprop
The 'iprop' variable is passed as an argument to the be32_to_cpup()
function, which expects a 'const _be *' type.
Change the iprop variable type so that the following build warnings
with W=1 are gone:
sound/soc/fsl/fsl_esai.c:860:54: warning: incorrect type in argument 1 (different base types)
sound/soc/fsl/fsl_esai.c:860:54: expected restricted __be32 const [usertype] *p
sound/soc/fsl/fsl_esai.c:860:54: got unsigned int const [usertype] *[assigned] iprop
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/fsl/fsl_esai.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c
index cef79a1a620b..40a700493f4c 100644
--- a/sound/soc/fsl/fsl_esai.c
+++ b/sound/soc/fsl/fsl_esai.c
@@ -788,7 +788,7 @@ static int fsl_esai_probe(struct platform_device *pdev)
struct device_node *np = pdev->dev.of_node;
struct fsl_esai *esai_priv;
struct resource *res;
- const uint32_t *iprop;
+ const __be32 *iprop;
void __iomem *regs;
int irq, ret;
--
2.16.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/4] ASoC: fsl_utils: Use 'const _be *' type for iprop
2018-02-11 21:53 [PATCH 1/4] ASoC: fsl-asoc-card: Use 'snd_pcm_format_t' type when appropriate Fabio Estevam
2018-02-11 21:53 ` [PATCH 2/4] ASoC: fsl_esai: Use 'const _be *' type for iprop Fabio Estevam
@ 2018-02-11 21:53 ` Fabio Estevam
2018-02-12 12:52 ` Applied "ASoC: fsl_utils: Use 'const _be *' type for iprop" to the asoc tree Mark Brown
2018-02-11 21:53 ` [PATCH 4/4] ASoC: fsl_ssi: Use 'const _be *' type for iprop Fabio Estevam
2018-02-12 12:53 ` Applied "ASoC: fsl-asoc-card: Use 'snd_pcm_format_t' type when appropriate" " Mark Brown
3 siblings, 1 reply; 8+ messages in thread
From: Fabio Estevam @ 2018-02-11 21:53 UTC (permalink / raw)
To: broonie; +Cc: nicoleotsuka, Fabio Estevam, alsa-devel, timur
From: Fabio Estevam <fabio.estevam@nxp.com>
The 'iprop' variable is passed as an argument to the be32_to_cpup()
function, which expects a 'const _be *' type.
Change the iprop variable type so that the following build warnings
with W=1 are gone:
sound/soc/fsl/fsl_utils.c:72:40: warning: incorrect type in argument 1 (different base types)
sound/soc/fsl/fsl_utils.c:72:40: expected restricted __be32 const [usertype] *p
sound/soc/fsl/fsl_utils.c:72:40: got unsigned int const [usertype] *[assigned] iprop
sound/soc/fsl/fsl_utils.c:80:32: warning: incorrect type in argument 1 (different base types)
sound/soc/fsl/fsl_utils.c:80:32: expected restricted __be32 const [usertype] *p
sound/soc/fsl/fsl_utils.c:80:32: got unsigned int const [usertype] *[assigned] iprop
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
sound/soc/fsl/fsl_utils.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/fsl/fsl_utils.c b/sound/soc/fsl/fsl_utils.c
index b9e42b5..7592b04 100644
--- a/sound/soc/fsl/fsl_utils.c
+++ b/sound/soc/fsl/fsl_utils.c
@@ -36,7 +36,7 @@ int fsl_asoc_get_dma_channel(struct device_node *ssi_np,
{
struct resource res;
struct device_node *dma_channel_np, *dma_np;
- const u32 *iprop;
+ const __be32 *iprop;
int ret;
dma_channel_np = of_parse_phandle(ssi_np, name, 0);
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* Applied "ASoC: fsl_utils: Use 'const _be *' type for iprop" to the asoc tree
2018-02-11 21:53 ` [PATCH 3/4] ASoC: fsl_utils: Use 'const _be *' type for iprop Fabio Estevam
@ 2018-02-12 12:52 ` Mark Brown
0 siblings, 0 replies; 8+ messages in thread
From: Mark Brown @ 2018-02-12 12:52 UTC (permalink / raw)
To: Fabio Estevam; +Cc: nicoleotsuka, alsa-devel, broonie, timur
The patch
ASoC: fsl_utils: Use 'const _be *' type for iprop
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From cb3981b6a64e1353b4f8ee70f97583f59c9772d0 Mon Sep 17 00:00:00 2001
From: Fabio Estevam <fabio.estevam@nxp.com>
Date: Sun, 11 Feb 2018 19:53:20 -0200
Subject: [PATCH] ASoC: fsl_utils: Use 'const _be *' type for iprop
The 'iprop' variable is passed as an argument to the be32_to_cpup()
function, which expects a 'const _be *' type.
Change the iprop variable type so that the following build warnings
with W=1 are gone:
sound/soc/fsl/fsl_utils.c:72:40: warning: incorrect type in argument 1 (different base types)
sound/soc/fsl/fsl_utils.c:72:40: expected restricted __be32 const [usertype] *p
sound/soc/fsl/fsl_utils.c:72:40: got unsigned int const [usertype] *[assigned] iprop
sound/soc/fsl/fsl_utils.c:80:32: warning: incorrect type in argument 1 (different base types)
sound/soc/fsl/fsl_utils.c:80:32: expected restricted __be32 const [usertype] *p
sound/soc/fsl/fsl_utils.c:80:32: got unsigned int const [usertype] *[assigned] iprop
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/fsl/fsl_utils.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/fsl/fsl_utils.c b/sound/soc/fsl/fsl_utils.c
index b9e42b503a37..7592b0406370 100644
--- a/sound/soc/fsl/fsl_utils.c
+++ b/sound/soc/fsl/fsl_utils.c
@@ -36,7 +36,7 @@ int fsl_asoc_get_dma_channel(struct device_node *ssi_np,
{
struct resource res;
struct device_node *dma_channel_np, *dma_np;
- const u32 *iprop;
+ const __be32 *iprop;
int ret;
dma_channel_np = of_parse_phandle(ssi_np, name, 0);
--
2.16.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4/4] ASoC: fsl_ssi: Use 'const _be *' type for iprop
2018-02-11 21:53 [PATCH 1/4] ASoC: fsl-asoc-card: Use 'snd_pcm_format_t' type when appropriate Fabio Estevam
2018-02-11 21:53 ` [PATCH 2/4] ASoC: fsl_esai: Use 'const _be *' type for iprop Fabio Estevam
2018-02-11 21:53 ` [PATCH 3/4] ASoC: fsl_utils: Use 'const _be *' type for iprop Fabio Estevam
@ 2018-02-11 21:53 ` Fabio Estevam
2018-02-12 12:52 ` Applied "ASoC: fsl_ssi: Use 'const _be *' type for iprop" to the asoc tree Mark Brown
2018-02-12 12:53 ` Applied "ASoC: fsl-asoc-card: Use 'snd_pcm_format_t' type when appropriate" " Mark Brown
3 siblings, 1 reply; 8+ messages in thread
From: Fabio Estevam @ 2018-02-11 21:53 UTC (permalink / raw)
To: broonie; +Cc: nicoleotsuka, Fabio Estevam, alsa-devel, timur
From: Fabio Estevam <fabio.estevam@nxp.com>
The 'iprop' variable is passed as an argument to the be32_to_cpup()
function, which expects a 'const _be *' type.
Change the iprop variable type so that the following build warnings
with W=1 are gone:
sound/soc/fsl/fsl_ssi.c:1463:48: warning: incorrect type in argument 1 (different base types)
sound/soc/fsl/fsl_ssi.c:1463:48: expected restricted __be32 const [usertype] *p
sound/soc/fsl/fsl_ssi.c:1463:48: got unsigned int const [usertype] *[assigned] iprop
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
sound/soc/fsl/fsl_ssi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index aecd00f..24fb672 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -1377,7 +1377,7 @@ static int fsl_ssi_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
const struct of_device_id *of_id;
const char *p, *sprop;
- const uint32_t *iprop;
+ const __be32 *iprop;
struct resource *res;
void __iomem *iomem;
char name[64];
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Applied "ASoC: fsl_ssi: Use 'const _be *' type for iprop" to the asoc tree
2018-02-11 21:53 ` [PATCH 4/4] ASoC: fsl_ssi: Use 'const _be *' type for iprop Fabio Estevam
@ 2018-02-12 12:52 ` Mark Brown
0 siblings, 0 replies; 8+ messages in thread
From: Mark Brown @ 2018-02-12 12:52 UTC (permalink / raw)
To: Fabio Estevam; +Cc: nicoleotsuka, alsa-devel, broonie, timur
The patch
ASoC: fsl_ssi: Use 'const _be *' type for iprop
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From da18bcf72291bd4324ba249f881d7d0c205fd00a Mon Sep 17 00:00:00 2001
From: Fabio Estevam <fabio.estevam@nxp.com>
Date: Sun, 11 Feb 2018 19:53:21 -0200
Subject: [PATCH] ASoC: fsl_ssi: Use 'const _be *' type for iprop
The 'iprop' variable is passed as an argument to the be32_to_cpup()
function, which expects a 'const _be *' type.
Change the iprop variable type so that the following build warnings
with W=1 are gone:
sound/soc/fsl/fsl_ssi.c:1463:48: warning: incorrect type in argument 1 (different base types)
sound/soc/fsl/fsl_ssi.c:1463:48: expected restricted __be32 const [usertype] *p
sound/soc/fsl/fsl_ssi.c:1463:48: got unsigned int const [usertype] *[assigned] iprop
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/fsl/fsl_ssi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index aecd00f7929d..24fb672f3c65 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -1377,7 +1377,7 @@ static int fsl_ssi_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
const struct of_device_id *of_id;
const char *p, *sprop;
- const uint32_t *iprop;
+ const __be32 *iprop;
struct resource *res;
void __iomem *iomem;
char name[64];
--
2.16.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Applied "ASoC: fsl-asoc-card: Use 'snd_pcm_format_t' type when appropriate" to the asoc tree
2018-02-11 21:53 [PATCH 1/4] ASoC: fsl-asoc-card: Use 'snd_pcm_format_t' type when appropriate Fabio Estevam
` (2 preceding siblings ...)
2018-02-11 21:53 ` [PATCH 4/4] ASoC: fsl_ssi: Use 'const _be *' type for iprop Fabio Estevam
@ 2018-02-12 12:53 ` Mark Brown
3 siblings, 0 replies; 8+ messages in thread
From: Mark Brown @ 2018-02-12 12:53 UTC (permalink / raw)
To: Fabio Estevam; +Cc: nicoleotsuka, alsa-devel, broonie, timur
The patch
ASoC: fsl-asoc-card: Use 'snd_pcm_format_t' type when appropriate
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From fc734c244ab5bad427baa57e2e729d2a623b2fa1 Mon Sep 17 00:00:00 2001
From: Fabio Estevam <fabio.estevam@nxp.com>
Date: Sun, 11 Feb 2018 19:53:18 -0200
Subject: [PATCH] ASoC: fsl-asoc-card: Use 'snd_pcm_format_t' type when
appropriate
A better suited type for 'sample_format' and 'asrc_format' is
'snd_pcm_format_t'.
Change the type so that the following build warnings with W=1 are gone:
sound/soc/fsl/fsl-asoc-card.c:153:29: warning: incorrect type in assignment (different base types)
sound/soc/fsl/fsl-asoc-card.c:153:29: expected unsigned int [unsigned] [usertype] sample_format
sound/soc/fsl/fsl-asoc-card.c:153:29: got restricted snd_pcm_format_t
sound/soc/fsl/fsl-asoc-card.c:258:44: warning: restricted snd_pcm_format_t degrades to integer
sound/soc/fsl/fsl-asoc-card.c:525:29: warning: incorrect type in assignment (different base types)
sound/soc/fsl/fsl-asoc-card.c:525:29: expected unsigned int [unsigned] [usertype] sample_format
sound/soc/fsl/fsl-asoc-card.c:525:29: got restricted snd_pcm_format_t [usertype] <noident>
sound/soc/fsl/fsl-asoc-card.c:680:43: warning: incorrect type in assignment (different base types)
sound/soc/fsl/fsl-asoc-card.c:680:43: expected unsigned int [unsigned] [usertype] asrc_format
sound/soc/fsl/fsl-asoc-card.c:680:43: got restricted snd_pcm_format_t [usertype] <noident>
sound/soc/fsl/fsl-asoc-card.c:682:43: warning: incorrect type in assignment (different base types)
sound/soc/fsl/fsl-asoc-card.c:682:43: expected unsigned int [unsigned] [usertype] asrc_format
sound/soc/fsl/fsl-asoc-card.c:682:43: got restricted snd_pcm_format_t [usertype] <noident>
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/fsl/fsl-asoc-card.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c
index 989be518c4ed..4a6750aa3637 100644
--- a/sound/soc/fsl/fsl-asoc-card.c
+++ b/sound/soc/fsl/fsl-asoc-card.c
@@ -91,9 +91,9 @@ struct fsl_asoc_card_priv {
struct cpu_priv cpu_priv;
struct snd_soc_card card;
u32 sample_rate;
- u32 sample_format;
+ snd_pcm_format_t sample_format;
u32 asrc_rate;
- u32 asrc_format;
+ snd_pcm_format_t asrc_format;
u32 dai_fmt;
char name[32];
};
@@ -199,7 +199,7 @@ static int be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
mask = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
snd_mask_none(mask);
- snd_mask_set(mask, priv->asrc_format);
+ snd_mask_set(mask, (__force int)priv->asrc_format);
return 0;
}
--
2.16.1
^ permalink raw reply related [flat|nested] 8+ messages in thread