ASoC: rt5677: Fix initialization of rt5677_of_match.data
Subsystems (3)
PATCH v2 1/1 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 },
^~~~~~--
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(-)
sound/soc/codecs/rt5677.c +1 -1
@@ -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);
Signature · 1 line
2.18.0.597.ga71716f1ad-goog
Quoted 8 lines · 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]
Quoted 5 lines
{ .compatible = "realtek,rt5677", RT5677 }, ^~~~~~Fixes ddc9e69b9dc2 ("ASoC: rt5677: Hide platform data in the module sources")Signed-off-by Matthias Kaehlcke <[email protected]>
Quoted 25 lines
--
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(-)sound/soc/codecs/rt5677.c +1
-2@@ -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
Quoted 9 lines · 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]
Quoted 6 lines
{ .compatible = "realtek,rt5677", RT5677 }, ^~~~~~Fixes ddc9e69b9dc2 ("ASoC: rt5677: Hide platform data in the modulesources")
Signed-off-by Matthias Kaehlcke <[email protected]>
While this is correct fix, it seems it was never used.
Quoted 7 lines
static const struct
of_device_idrt5677_of_match[] = {(quoted diff) +1
-1- { .compatible = "realtek,rt5677", RT5677 }, + { .compatible = "realtek,rt5677", .data = (const void *)RT5677},
{ }
};
MODULE_DEVICE_TABLE(of, rt5677_of_match);
Signature · 2 lines
Andy Shevchenko <[email protected]> Intel Finland Oy
Quoted 13 lines · Andy Shevchenko
Quoted 12 lines · 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 }, ^~~~~~
Quoted 5 lines
Quoted 3 lines
Fixes ddc9e69b9dc2 ("ASoC: rt5677: Hide platform data in the modulesources")
Signed-off-by Matthias Kaehlcke <[email protected]>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.
Quoted 1 line
Acked-by Andy Shevchenko <[email protected]>
Thanks
Matthias
Mark Brown
maintainerApplied "ASoC: rt5677: Fix initialization of rt5677_of_match.data" to the asoc tree
In reply to Matthias KaehlckeThe 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
Quoted 1 line
From
f861e3e28a3016a2064d9f600eaa92a530b732b4Mon Sep 17 00:00:00 2001
From: Matthias Kaehlcke <[email protected]>
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 },
^~~~~~--- sound/soc/codecs/rt5677.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/rt5677.c +1 -1
@@ -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);
Signature · 1 line
2.18.0