Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-29 15:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge series "ASoC: fix !OF compile test warnings" from Krzysztof Kozlowski <krzk@kernel.org>:

Browse Source 
Hi,

Changes since v1:
1. New patch 2/39: ASoC: bd28623: mark OF related data as maybe unused,
2. Patches 1-13: add maybe_unused after discussions with Mark,
3. Add Sylwester's review to two patches (one changed so please review
   one more time).

Best regards,
Krzysztof

Krzysztof Kozlowski (39):
  ASoC: ak5558: mark OF related data as maybe unused
  ASoC: bd28623: mark OF related data as maybe unused
  ASoC: gtm601: mark OF related data as maybe unused
  ASoC: inno_rk3036: mark OF related data as maybe unused
  ASoC: rk3328: mark OF related data as maybe unused
  ASoC: tas571x: mark OF related data as maybe unused
  ASoC: kirkwood: armada-370-db: mark OF related data as maybe unused
  ASoC: meson: t9015: mark OF related data as maybe unused
  ASoC: qcom: mark OF related data as maybe unused
  ASoC: samsung: smdk_wm8994: mark OF related data as maybe unused
  ASoC: rockchip: mark OF related data as maybe unused
  ASoC: ti: davinci: mark OF related data as maybe unused
  ASoC: uniphier: mark OF related data as maybe unused
  ASoC: ak4118: skip of_device_id table when !CONFIG_OF
  ASoC: alc5623: skip of_device_id table when !CONFIG_OF
  ASoC: alc5632: skip of_device_id table when !CONFIG_OF
  ASoC: da7218: skip of_device_id table when !CONFIG_OF
  ASoC: da7219: skip of_device_id table when !CONFIG_OF
  ASoC: da9055: skip of_device_id table when !CONFIG_OF
  ASoC: es8316: skip of_device_id table when !CONFIG_OF
  ASoC: max98090: skip of_device_id table when !CONFIG_OF
  ASoC: max98095: skip of_device_id table when !CONFIG_OF
  ASoC: max98371: skip of_device_id table when !CONFIG_OF
  ASoC: max9867: skip of_device_id table when !CONFIG_OF
  ASoC: max98925: skip of_device_id table when !CONFIG_OF
  ASoC: max98926: skip of_device_id table when !CONFIG_OF
  ASoC: pcm1789: skip of_device_id table when !CONFIG_OF
  ASoC: pcm179x: skip of_device_id table when !CONFIG_OF
  ASoC: rt5660: skip of_device_id table when !CONFIG_OF
  ASoC: tas2562: skip of_device_id table when !CONFIG_OF
  ASoC: tlv320: skip of_device_id table when !CONFIG_OF
  ASoC: ts3a227e: skip of_device_id table when !CONFIG_OF
  ASoC: es7134: mark OF related data as maybe unused
  ASoC: es7241: mark OF related data as maybe unused
  ASoC: samsung: i2s: mark OF related data as maybe unused
  ASoC: max98371: drop driver pm=NULL assignment
  ASoC: max98925: drop driver pm=NULL assignment
  ASoC: max98926: drop driver pm=NULL assignment
  ASoC: samsung: smdk_wm8994: remove redundant of_match_ptr()

 sound/soc/codecs/ak4118.c           | 2 ++
 sound/soc/codecs/ak5558.c           | 2 +-
 sound/soc/codecs/alc5623.c          | 2 ++
 sound/soc/codecs/alc5632.c          | 2 ++
 sound/soc/codecs/bd28623.c          | 2 +-
 sound/soc/codecs/da7218.c           | 2 ++
 sound/soc/codecs/da7219.c           | 2 ++
 sound/soc/codecs/da9055.c           | 2 ++
 sound/soc/codecs/es7134.c           | 4 ++--
 sound/soc/codecs/es7241.c           | 2 +-
 sound/soc/codecs/es8316.c           | 2 ++
 sound/soc/codecs/gtm601.c           | 2 +-
 sound/soc/codecs/inno_rk3036.c      | 2 +-
 sound/soc/codecs/max98090.c         | 2 ++
 sound/soc/codecs/max98095.c         | 2 ++
 sound/soc/codecs/max98371.c         | 3 ++-
 sound/soc/codecs/max9867.c          | 2 ++
 sound/soc/codecs/max98925.c         | 3 ++-
 sound/soc/codecs/max98926.c         | 3 ++-
 sound/soc/codecs/pcm1789-i2c.c      | 2 ++
 sound/soc/codecs/pcm179x-i2c.c      | 2 ++
 sound/soc/codecs/rk3328_codec.c     | 2 +-
 sound/soc/codecs/rt5660.c           | 2 ++
 sound/soc/codecs/tas2562.c          | 2 ++
 sound/soc/codecs/tas571x.c          | 4 ++--
 sound/soc/codecs/tlv320adcx140.c    | 2 ++
 sound/soc/codecs/tlv320aic23-i2c.c  | 2 ++
 sound/soc/codecs/ts3a227e.c         | 2 ++
 sound/soc/kirkwood/armada-370-db.c  | 2 +-
 sound/soc/meson/t9015.c             | 2 +-
 sound/soc/qcom/apq8016_sbc.c        | 2 +-
 sound/soc/qcom/lpass-apq8016.c      | 2 +-
 sound/soc/qcom/lpass-ipq806x.c      | 2 +-
 sound/soc/qcom/lpass-sc7180.c       | 2 +-
 sound/soc/rockchip/rockchip_i2s.c   | 2 +-
 sound/soc/rockchip/rockchip_pdm.c   | 2 +-
 sound/soc/rockchip/rockchip_spdif.c | 2 +-
 sound/soc/samsung/i2s.c             | 8 ++++----
 sound/soc/samsung/smdk_wm8994.c     | 4 ++--
 sound/soc/ti/davinci-i2s.c          | 2 +-
 sound/soc/uniphier/aio-ld11.c       | 2 +-
 sound/soc/uniphier/aio-pxs2.c       | 2 +-
 sound/soc/uniphier/evea.c           | 2 +-
 43 files changed, 69 insertions(+), 32 deletions(-)

--
2.25.1
This commit is contained in:
Mark Brown 2020-11-26 20:03:00 +00:00
commit 0858fc17b6
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
43 changed files with 69 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/codecs/ak4118.c
View File

@ -404,11 +404,13 @@ static int ak4118_i2c_probe(struct i2c_client *i2c,
&soc_component_drv_ak4118, &ak4118_dai, 1);
}
#ifdef CONFIG_OF
static const struct of_device_id ak4118_of_match[] = {
{ .compatible = "asahi-kasei,ak4118", },
{}
};
MODULE_DEVICE_TABLE(of, ak4118_of_match);
#endif
static const struct i2c_device_id ak4118_id_table[] = {
{ "ak4118", 0 },

2
sound/soc/codecs/ak5558.c
View File

@ -415,7 +415,7 @@ static int ak5558_i2c_remove(struct i2c_client *i2c)
return 0;
}
static const struct of_device_id ak5558_i2c_dt_ids[] = {
static const struct of_device_id ak5558_i2c_dt_ids[] __maybe_unused = {
{ .compatible = "asahi-kasei,ak5558"},
{ }
};

2
sound/soc/codecs/alc5623.c
View File

@ -1068,11 +1068,13 @@ static const struct i2c_device_id alc5623_i2c_table[] = {
};
MODULE_DEVICE_TABLE(i2c, alc5623_i2c_table);
#ifdef CONFIG_OF
static const struct of_device_id alc5623_of_match[] = {
{ .compatible = "realtek,alc5623", },
{ }
};
MODULE_DEVICE_TABLE(of, alc5623_of_match);
#endif
/* i2c codec control layer */
static struct i2c_driver alc5623_i2c_driver = {

2
sound/soc/codecs/alc5632.c
View File

@ -1167,11 +1167,13 @@ static const struct i2c_device_id alc5632_i2c_table[] = {
};
MODULE_DEVICE_TABLE(i2c, alc5632_i2c_table);
#ifdef CONFIG_OF
static const struct of_device_id alc5632_of_match[] = {
{ .compatible = "realtek,alc5632", },
{ }
};
MODULE_DEVICE_TABLE(of, alc5632_of_match);
#endif
/* i2c codec control layer */
static struct i2c_driver alc5632_i2c_driver = {

2
sound/soc/codecs/bd28623.c
View File

@ -222,7 +222,7 @@ static int bd28623_probe(struct platform_device *pdev)
&soc_dai_bd, 1);
}
static const struct of_device_id bd28623_of_match[] = {
static const struct of_device_id bd28623_of_match[] __maybe_unused = {
{ .compatible = "rohm,bd28623", },
{}
};

2
sound/soc/codecs/da7218.c
View File

@ -2278,12 +2278,14 @@ static irqreturn_t da7218_irq_thread(int irq, void *data)
* DT
*/
#ifdef CONFIG_OF
static const struct of_device_id da7218_of_match[] = {
{ .compatible = "dlg,da7217", .data = (void *) DA7217_DEV_ID },
{ .compatible = "dlg,da7218", .data = (void *) DA7218_DEV_ID },
{ }
};
MODULE_DEVICE_TABLE(of, da7218_of_match);
#endif
static inline int da7218_of_get_id(struct device *dev)
{

2
sound/soc/codecs/da7219.c
View File

@ -1702,11 +1702,13 @@ static struct snd_soc_dai_driver da7219_dai = {
* DT/ACPI
*/
#ifdef CONFIG_OF
static const struct of_device_id da7219_of_match[] = {
{ .compatible = "dlg,da7219", },
{ }
};
MODULE_DEVICE_TABLE(of, da7219_of_match);
#endif
#ifdef CONFIG_ACPI
static const struct acpi_device_id da7219_acpi_match[] = {

2
sound/soc/codecs/da9055.c
View File

@ -1519,11 +1519,13 @@ static const struct i2c_device_id da9055_i2c_id[] = {
};
MODULE_DEVICE_TABLE(i2c, da9055_i2c_id);
#ifdef CONFIG_OF
static const struct of_device_id da9055_of_match[] = {
{ .compatible = "dlg,da9055-codec", },
{ }
};
MODULE_DEVICE_TABLE(of, da9055_of_match);
#endif
/* I2C codec control layer */
static struct i2c_driver da9055_i2c_driver = {

4
sound/soc/codecs/es7134.c
View File

@ -183,7 +183,7 @@ static const struct snd_soc_dapm_route es7134_extra_routes[] = {
{ "Playback", NULL, "VDD", }
};
static const struct es7134_chip es7134_chip = {
static const struct es7134_chip es7134_chip __maybe_unused = {
.dai_drv = &es7134_dai,
.modes = es7134_modes,
.mode_num = ARRAY_SIZE(es7134_modes),
@ -261,7 +261,7 @@ static const struct snd_soc_dapm_route es7154_extra_routes[] = {
{ "Playback", NULL, "PVDD", }
};
static const struct es7134_chip es7154_chip = {
static const struct es7134_chip es7154_chip __maybe_unused = {
.dai_drv = &es7154_dai,
.modes = es7154_modes,
.mode_num = ARRAY_SIZE(es7154_modes),

2
sound/soc/codecs/es7241.c
View File

@ -203,7 +203,7 @@ static const struct es7241_clock_mode es7241_modes[] = {
},
};
static const struct es7241_chip es7241_chip = {
static const struct es7241_chip es7241_chip __maybe_unused = {
.modes = es7241_modes,
.mode_num = ARRAY_SIZE(es7241_modes),
};

2
sound/soc/codecs/es8316.c
View File

@ -834,11 +834,13 @@ static const struct i2c_device_id es8316_i2c_id[] = {
};
MODULE_DEVICE_TABLE(i2c, es8316_i2c_id);
#ifdef CONFIG_OF
static const struct of_device_id es8316_of_match[] = {
{ .compatible = "everest,es8316", },
{},
};
MODULE_DEVICE_TABLE(of, es8316_of_match);
#endif
#ifdef CONFIG_ACPI
static const struct acpi_device_id es8316_acpi_match[] = {

2
sound/soc/codecs/gtm601.c
View File

@ -87,7 +87,7 @@ static int gtm601_platform_probe(struct platform_device *pdev)
(struct snd_soc_dai_driver *)dai_driver, 1);
}
static const struct of_device_id gtm601_codec_of_match[] = {
static const struct of_device_id gtm601_codec_of_match[] __maybe_unused = {
{ .compatible = "option,gtm601", .data = (void *)&gtm601_dai },
{ .compatible = "broadmobi,bm818", .data = (void *)&bm818_dai },
{},

2
sound/soc/codecs/inno_rk3036.c
View File

@ -467,7 +467,7 @@ static int rk3036_codec_platform_remove(struct platform_device *pdev)
return 0;
}
static const struct of_device_id rk3036_codec_of_match[] = {
static const struct of_device_id rk3036_codec_of_match[] __maybe_unused = {
{ .compatible = "rockchip,rk3036-codec", },
{}
};

2
sound/soc/codecs/max98090.c
View File

@ -2668,12 +2668,14 @@ static const struct i2c_device_id max98090_i2c_id[] = {
};
MODULE_DEVICE_TABLE(i2c, max98090_i2c_id);
#ifdef CONFIG_OF
static const struct of_device_id max98090_of_match[] = {
{ .compatible = "maxim,max98090", },
{ .compatible = "maxim,max98091", },
{ }
};
MODULE_DEVICE_TABLE(of, max98090_of_match);
#endif
#ifdef CONFIG_ACPI
static const struct acpi_device_id max98090_acpi_match[] = {

2
sound/soc/codecs/max98095.c
View File

@ -2148,11 +2148,13 @@ static const struct i2c_device_id max98095_i2c_id[] = {
};
MODULE_DEVICE_TABLE(i2c, max98095_i2c_id);
#ifdef CONFIG_OF
static const struct of_device_id max98095_of_match[] = {
{ .compatible = "maxim,max98095", },
{ }
};
MODULE_DEVICE_TABLE(of, max98095_of_match);
#endif
static struct i2c_driver max98095_i2c_driver = {
.driver = {

3
sound/soc/codecs/max98371.c
View File

@ -408,16 +408,17 @@ static const struct i2c_device_id max98371_i2c_id[] = {
MODULE_DEVICE_TABLE(i2c, max98371_i2c_id);
#ifdef CONFIG_OF
static const struct of_device_id max98371_of_match[] = {
{ .compatible = "maxim,max98371", },
{ }
};
MODULE_DEVICE_TABLE(of, max98371_of_match);
#endif
static struct i2c_driver max98371_i2c_driver = {
.driver = {
.name = "max98371",
.pm = NULL,
.of_match_table = of_match_ptr(max98371_of_match),
},
.probe = max98371_i2c_probe,

2
sound/soc/codecs/max9867.c
View File

@ -649,11 +649,13 @@ static const struct i2c_device_id max9867_i2c_id[] = {
};
MODULE_DEVICE_TABLE(i2c, max9867_i2c_id);
#ifdef CONFIG_OF
static const struct of_device_id max9867_of_match[] = {
{ .compatible = "maxim,max9867", },
{ }
};
MODULE_DEVICE_TABLE(of, max9867_of_match);
#endif
static struct i2c_driver max9867_i2c_driver = {
.driver = {

3
sound/soc/codecs/max98925.c
View File

@ -627,17 +627,18 @@ static const struct i2c_device_id max98925_i2c_id[] = {
};
MODULE_DEVICE_TABLE(i2c, max98925_i2c_id);
#ifdef CONFIG_OF
static const struct of_device_id max98925_of_match[] = {
{ .compatible = "maxim,max98925", },
{ }
};
MODULE_DEVICE_TABLE(of, max98925_of_match);
#endif
static struct i2c_driver max98925_i2c_driver = {
.driver = {
.name = "max98925",
.of_match_table = of_match_ptr(max98925_of_match),
.pm = NULL,
},
.probe = max98925_i2c_probe,
.id_table = max98925_i2c_id,

3
sound/soc/codecs/max98926.c
View File

@ -571,17 +571,18 @@ static const struct i2c_device_id max98926_i2c_id[] = {
};
MODULE_DEVICE_TABLE(i2c, max98926_i2c_id);
#ifdef CONFIG_OF
static const struct of_device_id max98926_of_match[] = {
{ .compatible = "maxim,max98926", },
{ }
};
MODULE_DEVICE_TABLE(of, max98926_of_match);
#endif
static struct i2c_driver max98926_i2c_driver = {
.driver = {
.name = "max98926",
.of_match_table = of_match_ptr(max98926_of_match),
.pm = NULL,
},
.probe = max98926_i2c_probe,
.id_table = max98926_i2c_id,

2
sound/soc/codecs/pcm1789-i2c.c
View File

@ -33,11 +33,13 @@ static int pcm1789_i2c_remove(struct i2c_client *client)
return pcm1789_common_exit(&client->dev);
}
#ifdef CONFIG_OF
static const struct of_device_id pcm1789_of_match[] = {
{ .compatible = "ti,pcm1789", },
{ }
};
MODULE_DEVICE_TABLE(of, pcm1789_of_match);
#endif
static const struct i2c_device_id pcm1789_i2c_ids[] = {
{ "pcm1789", 0 },

2
sound/soc/codecs/pcm179x-i2c.c
View File

@ -30,11 +30,13 @@ static int pcm179x_i2c_probe(struct i2c_client *client,
return pcm179x_common_init(&client->dev, regmap);
}
#ifdef CONFIG_OF
static const struct of_device_id pcm179x_of_match[] = {
{ .compatible = "ti,pcm1792a", },
{ }
};
MODULE_DEVICE_TABLE(of, pcm179x_of_match);
#endif
static const struct i2c_device_id pcm179x_i2c_ids[] = {
{ "pcm179x", 0 },

2
sound/soc/codecs/rk3328_codec.c
View File

@ -499,7 +499,7 @@ static int rk3328_platform_probe(struct platform_device *pdev)
ARRAY_SIZE(rk3328_dai));
}
static const struct of_device_id rk3328_codec_of_match[] = {
static const struct of_device_id rk3328_codec_of_match[] __maybe_unused = {
{ .compatible = "rockchip,rk3328-codec", },
{},
};

2
sound/soc/codecs/rt5660.c
View File

@ -1235,11 +1235,13 @@ static const struct i2c_device_id rt5660_i2c_id[] = {
};
MODULE_DEVICE_TABLE(i2c, rt5660_i2c_id);
#ifdef CONFIG_OF
static const struct of_device_id rt5660_of_match[] = {
{ .compatible = "realtek,rt5660", },
{},
};
MODULE_DEVICE_TABLE(of, rt5660_of_match);
#endif
#ifdef CONFIG_ACPI
static const struct acpi_device_id rt5660_acpi_match[] = {

2
sound/soc/codecs/tas2562.c
View File

@ -802,6 +802,7 @@ static const struct i2c_device_id tas2562_id[] = {
};
MODULE_DEVICE_TABLE(i2c, tas2562_id);
#ifdef CONFIG_OF
static const struct of_device_id tas2562_of_match[] = {
{ .compatible = "ti,tas2562", },
{ .compatible = "ti,tas2563", },
@ -810,6 +811,7 @@ static const struct of_device_id tas2562_of_match[] = {
{ },
};
MODULE_DEVICE_TABLE(of, tas2562_of_match);
#endif
static struct i2c_driver tas2562_i2c_driver = {
.driver = {

4
sound/soc/codecs/tas571x.c
View File

@ -773,7 +773,7 @@ static struct snd_soc_dai_driver tas571x_dai = {
.ops = &tas571x_dai_ops,
};
static const struct of_device_id tas571x_of_match[];
static const struct of_device_id tas571x_of_match[] __maybe_unused;
static int tas571x_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
@ -889,7 +889,7 @@ static int tas571x_i2c_remove(struct i2c_client *client)
return 0;
}
static const struct of_device_id tas571x_of_match[] = {
static const struct of_device_id tas571x_of_match[] __maybe_unused = {
{ .compatible = "ti,tas5707", .data = &tas5707_chip, },
{ .compatible = "ti,tas5711", .data = &tas5711_chip, },
{ .compatible = "ti,tas5717", .data = &tas5717_chip, },

2
sound/soc/codecs/tlv320adcx140.c
View File

@ -1073,6 +1073,7 @@ static struct snd_soc_dai_driver adcx140_dai_driver[] = {
}
};
#ifdef CONFIG_OF
static const struct of_device_id tlv320adcx140_of_match[] = {
{ .compatible = "ti,tlv320adc3140" },
{ .compatible = "ti,tlv320adc5140" },
@ -1080,6 +1081,7 @@ static const struct of_device_id tlv320adcx140_of_match[] = {
{},
};
MODULE_DEVICE_TABLE(of, tlv320adcx140_of_match);
#endif
static int adcx140_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)

2
sound/soc/codecs/tlv320aic23-i2c.c
View File

@ -35,11 +35,13 @@ static const struct i2c_device_id tlv320aic23_id[] = {
MODULE_DEVICE_TABLE(i2c, tlv320aic23_id);
#ifdef CONFIG_OF
static const struct of_device_id tlv320aic23_of_match[] = {
{ .compatible = "ti,tlv320aic23", },
{ }
};
MODULE_DEVICE_TABLE(of, tlv320aic23_of_match);
#endif
static struct i2c_driver tlv320aic23_i2c_driver = {
.driver = {

2
sound/soc/codecs/ts3a227e.c
View File

@ -366,11 +366,13 @@ static const struct i2c_device_id ts3a227e_i2c_ids[] = {
};
MODULE_DEVICE_TABLE(i2c, ts3a227e_i2c_ids);
#ifdef CONFIG_OF
static const struct of_device_id ts3a227e_of_match[] = {
{ .compatible = "ti,ts3a227e", },
{ }
};
MODULE_DEVICE_TABLE(of, ts3a227e_of_match);
#endif
#ifdef CONFIG_ACPI
static struct acpi_device_id ts3a227e_acpi_match[] = {

2
sound/soc/kirkwood/armada-370-db.c
View File

@ -134,7 +134,7 @@ static int a370db_probe(struct platform_device *pdev)
return devm_snd_soc_register_card(card->dev, card);
}
static const struct of_device_id a370db_dt_ids[] = {
static const struct of_device_id a370db_dt_ids[] __maybe_unused = {
{ .compatible = "marvell,a370db-audio" },
{ },
};

2
sound/soc/meson/t9015.c
View File

@ -312,7 +312,7 @@ static int t9015_probe(struct platform_device *pdev)
&t9015_dai, 1);
}
static const struct of_device_id t9015_ids[] = {
static const struct of_device_id t9015_ids[] __maybe_unused = {
{ .compatible = "amlogic,t9015", },
{ }
};

2
sound/soc/qcom/apq8016_sbc.c
View File

@ -167,7 +167,7 @@ static int apq8016_sbc_platform_probe(struct platform_device *pdev)
return devm_snd_soc_register_card(&pdev->dev, card);
}
static const struct of_device_id apq8016_sbc_device_id[] = {
static const struct of_device_id apq8016_sbc_device_id[] __maybe_unused = {
{ .compatible = "qcom,apq8016-sbc-sndcard" },
{},
};

2
sound/soc/qcom/lpass-apq8016.c
View File

@ -291,7 +291,7 @@ static struct lpass_variant apq8016_data = {
.free_dma_channel = apq8016_lpass_free_dma_channel,
};
static const struct of_device_id apq8016_lpass_cpu_device_id[] = {
static const struct of_device_id apq8016_lpass_cpu_device_id[] __maybe_unused = {
{ .compatible = "qcom,lpass-cpu-apq8016", .data = &apq8016_data },
{}
};

2
sound/soc/qcom/lpass-ipq806x.c
View File

@ -161,7 +161,7 @@ static struct lpass_variant ipq806x_data = {
.free_dma_channel = ipq806x_lpass_free_dma_channel,
};
static const struct of_device_id ipq806x_lpass_cpu_device_id[] = {
static const struct of_device_id ipq806x_lpass_cpu_device_id[] __maybe_unused = {
{ .compatible = "qcom,lpass-cpu", .data = &ipq806x_data },
{}
};

2
sound/soc/qcom/lpass-sc7180.c
View File

@ -285,7 +285,7 @@ static struct lpass_variant sc7180_data = {
.free_dma_channel = sc7180_lpass_free_dma_channel,
};
static const struct of_device_id sc7180_lpass_cpu_device_id[] = {
static const struct of_device_id sc7180_lpass_cpu_device_id[] __maybe_unused = {
{.compatible = "qcom,sc7180-lpass-cpu", .data = &sc7180_data},
{}
};

2
sound/soc/rockchip/rockchip_i2s.c
View File

@ -566,7 +566,7 @@ static const struct rk_i2s_pins rk3399_i2s_pins = {
.shift = 11,
};
static const struct of_device_id rockchip_i2s_match[] = {
static const struct of_device_id rockchip_i2s_match[] __maybe_unused = {
{ .compatible = "rockchip,rk3066-i2s", },
{ .compatible = "rockchip,rk3188-i2s", },
{ .compatible = "rockchip,rk3288-i2s", },

2
sound/soc/rockchip/rockchip_pdm.c
View File

@ -460,7 +460,7 @@ static const struct regmap_config rockchip_pdm_regmap_config = {
.cache_type = REGCACHE_FLAT,
};
static const struct of_device_id rockchip_pdm_match[] = {
static const struct of_device_id rockchip_pdm_match[] __maybe_unused = {
{ .compatible = "rockchip,pdm",
.data = (void *)RK_PDM_RK3229 },
{ .compatible = "rockchip,px30-pdm",

2
sound/soc/rockchip/rockchip_spdif.c
View File

@ -41,7 +41,7 @@ struct rk_spdif_dev {
struct regmap *regmap;
};
static const struct of_device_id rk_spdif_match[] = {
static const struct of_device_id rk_spdif_match[] __maybe_unused = {
{ .compatible = "rockchip,rk3066-spdif",
.data = (void *)RK_SPDIF_RK3066 },
{ .compatible = "rockchip,rk3188-spdif",

8
sound/soc/samsung/i2s.c
View File

@ -1621,28 +1621,28 @@ static const struct samsung_i2s_dai_data i2sv3_dai_type = {
.i2s_variant_regs = &i2sv3_regs,
};
static const struct samsung_i2s_dai_data i2sv5_dai_type = {
static const struct samsung_i2s_dai_data i2sv5_dai_type __maybe_unused = {
.quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI | QUIRK_NEED_RSTCLR |
QUIRK_SUPPORTS_IDMA,
.pcm_rates = SNDRV_PCM_RATE_8000_96000,
.i2s_variant_regs = &i2sv3_regs,
};
static const struct samsung_i2s_dai_data i2sv6_dai_type = {
static const struct samsung_i2s_dai_data i2sv6_dai_type __maybe_unused = {
.quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI | QUIRK_NEED_RSTCLR |
QUIRK_SUPPORTS_TDM | QUIRK_SUPPORTS_IDMA,
.pcm_rates = SNDRV_PCM_RATE_8000_96000,
.i2s_variant_regs = &i2sv6_regs,
};
static const struct samsung_i2s_dai_data i2sv7_dai_type = {
static const struct samsung_i2s_dai_data i2sv7_dai_type __maybe_unused = {
.quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI | QUIRK_NEED_RSTCLR |
QUIRK_SUPPORTS_TDM,
.pcm_rates = SNDRV_PCM_RATE_8000_192000,
.i2s_variant_regs = &i2sv7_regs,
};
static const struct samsung_i2s_dai_data i2sv5_dai_type_i2s1 = {
static const struct samsung_i2s_dai_data i2sv5_dai_type_i2s1 __maybe_unused = {
.quirks = QUIRK_PRI_6CHAN | QUIRK_NEED_RSTCLR,
.pcm_rates = SNDRV_PCM_RATE_8000_96000,
.i2s_variant_regs = &i2sv5_i2s1_regs,

4
sound/soc/samsung/smdk_wm8994.c
View File

@ -136,7 +136,7 @@ static struct snd_soc_card smdk = {
.num_links = ARRAY_SIZE(smdk_dai),
};
static const struct of_device_id samsung_wm8994_of_match[] = {
static const struct of_device_id samsung_wm8994_of_match[] __maybe_unused = {
{ .compatible = "samsung,smdk-wm8994", .data = &smdk_board_data },
{},
};
@ -170,7 +170,7 @@ static int smdk_audio_probe(struct platform_device *pdev)
smdk_dai[0].platforms->of_node = smdk_dai[0].cpus->of_node;
}
id = of_match_device(of_match_ptr(samsung_wm8994_of_match), &pdev->dev);
id = of_match_device(samsung_wm8994_of_match, &pdev->dev);
if (id)
*board = *((struct smdk_wm8994_data *)id->data);

2
sound/soc/ti/davinci-i2s.c
View File

@ -747,7 +747,7 @@ static int davinci_i2s_remove(struct platform_device *pdev)
return 0;
}
static const struct of_device_id davinci_i2s_match[] = {
static const struct of_device_id davinci_i2s_match[] __maybe_unused = {
{ .compatible = "ti,da850-mcbsp" },
{},
};

2
sound/soc/uniphier/aio-ld11.c
View File

@ -372,7 +372,7 @@ static const struct uniphier_aio_chip_spec uniphier_aio_ld20_spec = {
.addr_ext = 1,
};
static const struct of_device_id uniphier_aio_of_match[] = {
static const struct of_device_id uniphier_aio_of_match[] __maybe_unused = {
{
.compatible = "socionext,uniphier-ld11-aio",
.data = &uniphier_aio_ld11_spec,

2
sound/soc/uniphier/aio-pxs2.c
View File

@ -282,7 +282,7 @@ static const struct uniphier_aio_chip_spec uniphier_aio_pxs2_spec = {
.addr_ext = 0,
};
static const struct of_device_id uniphier_aio_of_match[] = {
static const struct of_device_id uniphier_aio_of_match[] __maybe_unused = {
{
.compatible = "socionext,uniphier-pxs2-aio",
.data = &uniphier_aio_pxs2_spec,

2
sound/soc/uniphier/evea.c
View File

@ -551,7 +551,7 @@ static int evea_remove(struct platform_device *pdev)
return 0;
}
static const struct of_device_id evea_of_match[] = {
static const struct of_device_id evea_of_match[] __maybe_unused = {
{ .compatible = "socionext,uniphier-evea", },
{}
};