diff mbox series

[v2] ASoC: sun50i-dmic: avoid unused variable warning for sun50i_dmic_of_match

Message ID 1666511085-2748-1-git-send-email-fengzheng923@gmail.com
State New
Headers
Series [v2] ASoC: sun50i-dmic: avoid unused variable warning for sun50i_dmic_of_match |

Commit Message

Ban Tao Oct. 23, 2022, 7:44 a.m. UTC 
  In configurations with CONFIG_OF=n, we get a harmless build warning:

sound/soc/sunxi/sun50i-dmic.c:268:34: warning: unused variable
'sun50i_dmic_of_match' [-Wunused-const-variable]

Signed-off-by: Ban Tao <fengzheng923@gmail.com>
Reported-by: kernel test robot <lkp@intel.com>
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
---
v1->v2:Add "Acked-by" tag.
---
 sound/soc/sunxi/sun50i-dmic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Mark Brown Oct. 24, 2022, 2:01 p.m. UTC | #1 
On Sun, 23 Oct 2022 00:44:45 -0700, Ban Tao wrote:
> In configurations with CONFIG_OF=n, we get a harmless build warning:
> 
> sound/soc/sunxi/sun50i-dmic.c:268:34: warning: unused variable
> 'sun50i_dmic_of_match' [-Wunused-const-variable]
> 
> 

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: sun50i-dmic: avoid unused variable warning for sun50i_dmic_of_match
      commit: 2cfcc1085d3b7b7c893be41034853d4c63a41092

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
Chao Song Oct. 26, 2022, 2:31 p.m. UTC | #2 
On 10/23/2022 3:44 PM, Ban Tao wrote:
> In configurations with CONFIG_OF=n, we get a harmless build warning:
>
> sound/soc/sunxi/sun50i-dmic.c:268:34: warning: unused variable
> 'sun50i_dmic_of_match' [-Wunused-const-variable]
>
> Signed-off-by: Ban Tao <fengzheng923@gmail.com>
> Reported-by: kernel test robot <lkp@intel.com>
> Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
> ---
> v1->v2:Add "Acked-by" tag.
> ---
>   sound/soc/sunxi/sun50i-dmic.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/soc/sunxi/sun50i-dmic.c b/sound/soc/sunxi/sun50i-dmic.c
> index 86cff5a..62509cb 100644
> --- a/sound/soc/sunxi/sun50i-dmic.c
> +++ b/sound/soc/sunxi/sun50i-dmic.c
> @@ -391,7 +391,7 @@ static const struct dev_pm_ops sun50i_dmic_pm = {
>   static struct platform_driver sun50i_dmic_driver = {
>   	.driver         = {
>   		.name   = "sun50i-dmic",
> -		.of_match_table = of_match_ptr(sun50i_dmic_of_match),
> +		.of_match_table = sun50i_dmic_of_match,
I don't think this is the right direction (remove the of_match_ptr) to 
fix the issue.

of_match_ptr(of_table) returns of_table if CONFIG_OF=y, and returns NULL 
if CONFIG_OF=n.

So guard  the definition of sun50i_dmic_of_match with `#ifdef CONFIG_OF` 
should be better.

Many other drivers do it this way.

>   		.pm     = &sun50i_dmic_pm,
>   	},
>   	.probe          = sun50i_dmic_probe,
diff mbox series

Patch

diff --git a/sound/soc/sunxi/sun50i-dmic.c b/sound/soc/sunxi/sun50i-dmic.c
index 86cff5a..62509cb 100644
--- a/sound/soc/sunxi/sun50i-dmic.c
+++ b/sound/soc/sunxi/sun50i-dmic.c
@@ -391,7 +391,7 @@  static const struct dev_pm_ops sun50i_dmic_pm = {
 static struct platform_driver sun50i_dmic_driver = {
 	.driver         = {
 		.name   = "sun50i-dmic",
-		.of_match_table = of_match_ptr(sun50i_dmic_of_match),
+		.of_match_table = sun50i_dmic_of_match,
 		.pm     = &sun50i_dmic_pm,
 	},
 	.probe          = sun50i_dmic_probe,