[PATCH v2] ASoC: rt5677: Fix initialization of rt5677_of_match.data

[PATCH v2] ASoC: rt5677: Fix initialization of rt5677_of_match.data

[Matthias Kaehlcke]

The driver expects to find the device id in rt5677_of_match.data, however
it is currently assigned to rt5677_of_match.type. Fix this.

The problem was found with the help of clang:
  sound/soc/codecs/rt5677.c:5010:36: warning: expression which evaluates to
  zero treated as a null pointer constant of type 'const void *'
  [-Wnon-literal-null-conversion]
    { .compatible = "realtek,rt5677", RT5677 },
                                      ^~~~~~

Fixes: ddc9e69b9dc2 ("ASoC: rt5677: Hide platform data in the module sources")
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
--
Changes in v2:
- assign device id to data instead of 'type'
- updated subject and commit message
- added: 'Fixes' tag
---
 sound/soc/codecs/rt5677.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c
index 8a0181a2db08..47feef30dadb 100644
--- a/sound/soc/codecs/rt5677.c
+++ b/sound/soc/codecs/rt5677.c
@@ -5007,7 +5007,7 @@ static const struct regmap_config rt5677_regmap = {
 };
 
 static const struct of_device_id rt5677_of_match[] = {
-	{ .compatible = "realtek,rt5677", RT5677 },
+	{ .compatible = "realtek,rt5677", .data = (const void *)RT5677 },
 	{ }
 };
 MODULE_DEVICE_TABLE(of, rt5677_of_match);
-- 
2.18.0.597.ga71716f1ad-goog

Re: [PATCH v2] ASoC: rt5677: Fix initialization of rt5677_of_match.data

[Guenter Roeck]

On Tue, Aug 7, 2018 at 10:19 AM Matthias Kaehlcke <mka@chromium.org> wrote:
>
> The driver expects to find the device id in rt5677_of_match.data, however
> it is currently assigned to rt5677_of_match.type. Fix this.
>
> The problem was found with the help of clang:
>   sound/soc/codecs/rt5677.c:5010:36: warning: expression which evaluates to
>   zero treated as a null pointer constant of type 'const void *'
>   [-Wnon-literal-null-conversion]
>     { .compatible = "realtek,rt5677", RT5677 },
>                                       ^~~~~~
>
> Fixes: ddc9e69b9dc2 ("ASoC: rt5677: Hide platform data in the module sources")
> Signed-off-by: Matthias Kaehlcke <mka@chromium.org>

Reviewed-by: Guenter Roeck <groeck@chromium.org>

> --
> Changes in v2:
> - assign device id to data instead of 'type'
> - updated subject and commit message
> - added: 'Fixes' tag
> ---
>  sound/soc/codecs/rt5677.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c
> index 8a0181a2db08..47feef30dadb 100644
> --- a/sound/soc/codecs/rt5677.c
> +++ b/sound/soc/codecs/rt5677.c
> @@ -5007,7 +5007,7 @@ static const struct regmap_config rt5677_regmap = {
>  };
>
>  static const struct of_device_id rt5677_of_match[] = {
> -       { .compatible = "realtek,rt5677", RT5677 },
> +       { .compatible = "realtek,rt5677", .data = (const void *)RT5677 },
>         { }
>  };
>  MODULE_DEVICE_TABLE(of, rt5677_of_match);
> --
> 2.18.0.597.ga71716f1ad-goog
>

Re: [PATCH v2] ASoC: rt5677: Fix initialization of rt5677_of_match.data

[Andy Shevchenko]

On Tue, 2018-08-07 at 10:19 -0700, Matthias Kaehlcke wrote:
> The driver expects to find the device id in rt5677_of_match.data,
> however
> it is currently assigned to rt5677_of_match.type. Fix this.
> 
> The problem was found with the help of clang:
>   sound/soc/codecs/rt5677.c:5010:36: warning: expression which
> evaluates to
>   zero treated as a null pointer constant of type 'const void *'
>   [-Wnon-literal-null-conversion]
>     { .compatible = "realtek,rt5677", RT5677 },
>                                       ^~~~~~
> 
> Fixes: ddc9e69b9dc2 ("ASoC: rt5677: Hide platform data in the module
> sources")
> Signed-off-by: Matthias Kaehlcke <mka@chromium.org>

While this is correct fix, it seems it was never used.

Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 
>  static const struct of_device_id rt5677_of_match[] = {
> -	{ .compatible = "realtek,rt5677", RT5677 },
> +	{ .compatible = "realtek,rt5677", .data = (const void *)RT5677
> },
>  	{ }
>  };
>  MODULE_DEVICE_TABLE(of, rt5677_of_match);

-- 
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy

Re: [PATCH v2] ASoC: rt5677: Fix initialization of rt5677_of_match.data

[Matthias Kaehlcke]

On Tue, Aug 07, 2018 at 10:13:47PM +0300, Andy Shevchenko wrote:
> On Tue, 2018-08-07 at 10:19 -0700, Matthias Kaehlcke wrote:
> > The driver expects to find the device id in rt5677_of_match.data,
> > however
> > it is currently assigned to rt5677_of_match.type. Fix this.
> > 
> > The problem was found with the help of clang:
> >   sound/soc/codecs/rt5677.c:5010:36: warning: expression which
> > evaluates to
> >   zero treated as a null pointer constant of type 'const void *'
> >   [-Wnon-literal-null-conversion]
> >     { .compatible = "realtek,rt5677", RT5677 },
> >                                       ^~~~~~
> > 
> > Fixes: ddc9e69b9dc2 ("ASoC: rt5677: Hide platform data in the module
> > sources")
> > Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
> 
> While this is correct fix, it seems it was never used.

Or it was used but no problem was noticed because .data was already
0, which happens to be the value of RT5677.

> Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Thanks

Matthias

Applied "ASoC: rt5677: Fix initialization of rt5677_of_match.data" to the asoc tree

[Mark Brown]

The patch

   ASoC: rt5677: Fix initialization of rt5677_of_match.data

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 f861e3e28a3016a2064d9f600eaa92a530b732b4 Mon Sep 17 00:00:00 2001
From: Matthias Kaehlcke <mka@chromium.org>
Date: Tue, 7 Aug 2018 10:19:40 -0700
Subject: [PATCH] ASoC: rt5677: Fix initialization of rt5677_of_match.data

The driver expects to find the device id in rt5677_of_match.data, however
it is currently assigned to rt5677_of_match.type. Fix this.

The problem was found with the help of clang:
  sound/soc/codecs/rt5677.c:5010:36: warning: expression which evaluates to
  zero treated as a null pointer constant of type 'const void *'
  [-Wnon-literal-null-conversion]
    { .compatible = "realtek,rt5677", RT5677 },
                                      ^~~~~~

Fixes: ddc9e69b9dc2 ("ASoC: rt5677: Hide platform data in the module sources")
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Guenter Roeck <groeck@chromium.org>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/codecs/rt5677.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c
index 922becfee59b..9b7a1833d331 100644
--- a/sound/soc/codecs/rt5677.c
+++ b/sound/soc/codecs/rt5677.c
@@ -5008,7 +5008,7 @@ static const struct regmap_config rt5677_regmap = {
 };
 
 static const struct of_device_id rt5677_of_match[] = {
-	{ .compatible = "realtek,rt5677", RT5677 },
+	{ .compatible = "realtek,rt5677", .data = (const void *)RT5677 },
 	{ }
 };
 MODULE_DEVICE_TABLE(of, rt5677_of_match);
-- 
2.18.0