mmc: sdhci-brcmstb: Resolve "unused" warnings with CONFIG_OF=n

Message ID 20221205160353.1.I5fa28f1045f17fb9285d507accf139f8b2a8f4b5@changeid
State New
Headers
Series mmc: sdhci-brcmstb: Resolve "unused" warnings with CONFIG_OF=n |

Commit Message

Brian Norris Dec. 6, 2022, 12:04 a.m. UTC
  With W=1, we can see this gcc warning:

drivers/mmc/host/sdhci-brcmstb.c:182:34: warning: ‘sdhci_brcm_of_match’ defined but not used [-Wunused-const-variable=]
  182 | static const struct of_device_id sdhci_brcm_of_match[] = {
      |                                  ^~~~~~~~~~~~~~~~~~~

Rather than play around more with #ifdef's, the simplest solution is to
just mark this __maybe_unused.

Fixes: 1fad8422c989 ("mmc: sdhci-brcmstb: Allow building with COMPILE_TEST")
Reported-by: kernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/all/202212060700.NjMecjxS-lkp@intel.com/
Signed-off-by: Brian Norris <briannorris@chromium.org>
---

 drivers/mmc/host/sdhci-brcmstb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Florian Fainelli Dec. 6, 2022, 12:10 a.m. UTC | #1
On 12/5/22 16:04, Brian Norris wrote:
> With W=1, we can see this gcc warning:
> 
> drivers/mmc/host/sdhci-brcmstb.c:182:34: warning: ‘sdhci_brcm_of_match’ defined but not used [-Wunused-const-variable=]
>    182 | static const struct of_device_id sdhci_brcm_of_match[] = {
>        |                                  ^~~~~~~~~~~~~~~~~~~
> 
> Rather than play around more with #ifdef's, the simplest solution is to
> just mark this __maybe_unused.
> 
> Fixes: 1fad8422c989 ("mmc: sdhci-brcmstb: Allow building with COMPILE_TEST")
> Reported-by: kernel test robot <lkp@intel.com>
> Link: https://lore.kernel.org/all/202212060700.NjMecjxS-lkp@intel.com/
> Signed-off-by: Brian Norris <briannorris@chromium.org>

Acked-by: Florian Fainelli <f.fainelli@gmail.com>
  
Ulf Hansson Dec. 7, 2022, 12:37 p.m. UTC | #2
On Tue, 6 Dec 2022 at 01:04, Brian Norris <briannorris@chromium.org> wrote:
>
> With W=1, we can see this gcc warning:
>
> drivers/mmc/host/sdhci-brcmstb.c:182:34: warning: ‘sdhci_brcm_of_match’ defined but not used [-Wunused-const-variable=]
>   182 | static const struct of_device_id sdhci_brcm_of_match[] = {
>       |                                  ^~~~~~~~~~~~~~~~~~~
>
> Rather than play around more with #ifdef's, the simplest solution is to
> just mark this __maybe_unused.
>
> Fixes: 1fad8422c989 ("mmc: sdhci-brcmstb: Allow building with COMPILE_TEST")
> Reported-by: kernel test robot <lkp@intel.com>
> Link: https://lore.kernel.org/all/202212060700.NjMecjxS-lkp@intel.com/
> Signed-off-by: Brian Norris <briannorris@chromium.org>

Applied for next, thanks!

Kind regards
Uffe


> ---
>
>  drivers/mmc/host/sdhci-brcmstb.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/sdhci-brcmstb.c b/drivers/mmc/host/sdhci-brcmstb.c
> index 55d8bd232695..f2cf3d70db79 100644
> --- a/drivers/mmc/host/sdhci-brcmstb.c
> +++ b/drivers/mmc/host/sdhci-brcmstb.c
> @@ -179,7 +179,7 @@ static const struct brcmstb_match_priv match_priv_7216 = {
>         .ops = &sdhci_brcmstb_ops_7216,
>  };
>
> -static const struct of_device_id sdhci_brcm_of_match[] = {
> +static const struct of_device_id __maybe_unused sdhci_brcm_of_match[] = {
>         { .compatible = "brcm,bcm7425-sdhci", .data = &match_priv_7425 },
>         { .compatible = "brcm,bcm7445-sdhci", .data = &match_priv_7445 },
>         { .compatible = "brcm,bcm7216-sdhci", .data = &match_priv_7216 },
> --
> 2.39.0.rc0.267.gcb52ba06e7-goog
>
  

Patch

diff --git a/drivers/mmc/host/sdhci-brcmstb.c b/drivers/mmc/host/sdhci-brcmstb.c
index 55d8bd232695..f2cf3d70db79 100644
--- a/drivers/mmc/host/sdhci-brcmstb.c
+++ b/drivers/mmc/host/sdhci-brcmstb.c
@@ -179,7 +179,7 @@  static const struct brcmstb_match_priv match_priv_7216 = {
 	.ops = &sdhci_brcmstb_ops_7216,
 };
 
-static const struct of_device_id sdhci_brcm_of_match[] = {
+static const struct of_device_id __maybe_unused sdhci_brcm_of_match[] = {
 	{ .compatible = "brcm,bcm7425-sdhci", .data = &match_priv_7425 },
 	{ .compatible = "brcm,bcm7445-sdhci", .data = &match_priv_7445 },
 	{ .compatible = "brcm,bcm7216-sdhci", .data = &match_priv_7216 },