diff options
| author | Mark Brown | 2020-09-25 20:50:41 +0100 |
|---|---|---|
| committer | Mark Brown | 2020-09-25 20:50:41 +0100 |
| commit | d83fa234ae9ef68f973e1dabe19b7ec078cfcd63 (patch) | |
| tree | c2d0cf12f246f672134d7c5a6d83bb98a3faa9d2 /sound/soc/qcom/qdsp6/q6afe-clocks.c | |
| parent | 7e6799d8f87d7ab7ae55a229654d161b5bfae874 (diff) | |
| parent | 5d0576bba9eb37bf07dc58a91568a2332a22fbcd (diff) | |
Merge series "ASoC: qdsp6: fix some warnings when build without CONFIG_OF" from Srinivas Kandagatla <srinivas.kandagatla@linaro.org>:
Here are fixes for two warnings types discovered while building qdsp6 drivers
without CONFIG_OF and with W=1
One of them was reported by Intel kernel test robot on q6afe-clocks patch, which
equally applies to rest of the qdsp6 drivers.
changes since v1:
- added ifdef CONFIG_OF instead of removing of_match_ptr
Srinivas Kandagatla (2):
ASoC: qdsp6: add ifdef CONFIG_OF around of_device_id
ASoC: q6asm: fix kernel doc warnings
sound/soc/qcom/qdsp6/q6adm.c | 2 ++
sound/soc/qcom/qdsp6/q6afe-clocks.c | 2 ++
sound/soc/qcom/qdsp6/q6afe-dai.c | 2 ++
sound/soc/qcom/qdsp6/q6afe.c | 2 ++
sound/soc/qcom/qdsp6/q6asm-dai.c | 2 ++
sound/soc/qcom/qdsp6/q6asm.c | 6 ++++++
sound/soc/qcom/qdsp6/q6core.c | 2 ++
sound/soc/qcom/qdsp6/q6routing.c | 2 ++
8 files changed, 20 insertions(+)
--
2.21.0
Diffstat (limited to 'sound/soc/qcom/qdsp6/q6afe-clocks.c')
| -rw-r--r-- | sound/soc/qcom/qdsp6/q6afe-clocks.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/qcom/qdsp6/q6afe-clocks.c b/sound/soc/qcom/qdsp6/q6afe-clocks.c index 2967f4546af5..25b409597d51 100644 --- a/sound/soc/qcom/qdsp6/q6afe-clocks.c +++ b/sound/soc/qcom/qdsp6/q6afe-clocks.c @@ -251,11 +251,13 @@ static int q6afe_clock_dev_probe(struct platform_device *pdev) return 0; } +#ifdef CONFIG_OF static const struct of_device_id q6afe_clock_device_id[] = { { .compatible = "qcom,q6afe-clocks" }, {}, }; MODULE_DEVICE_TABLE(of, q6afe_clock_device_id); +#endif static struct platform_driver q6afe_clock_platform_driver = { .driver = { |