| Message ID | 20200925084925.26926-2-srinivas.kandagatla@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | ASoC: qdsp6: fix some warnings when build without CONFIG_OF | expand |
On 25/09/2020 17:17, Mark Brown wrote: > On Fri, Sep 25, 2020 at 09:49:24AM +0100, Srinivas Kandagatla wrote: >> The of_device_id is included unconditionally by of.h header and used >> in the driver as well. Remove of_match_ptr to fix W=1 compile test >> warning with !CONFIG_OF: > > It's better to fix this by adding #ifdefs around the table so that we > don't have unneeded bloat from the match table in !OF cases. > sure, I will respin series with that change! --srini
diff --git a/sound/soc/qcom/qdsp6/q6adm.c b/sound/soc/qcom/qdsp6/q6adm.c index 2f3ea6beb066..23611db59d5e 100644 --- a/sound/soc/qcom/qdsp6/q6adm.c +++ b/sound/soc/qcom/qdsp6/q6adm.c @@ -623,7 +623,7 @@ static struct apr_driver qcom_q6adm_driver = { .callback = q6adm_callback, .driver = { .name = "qcom-q6adm", - .of_match_table = of_match_ptr(q6adm_device_id), + .of_match_table = q6adm_device_id }, }; diff --git a/sound/soc/qcom/qdsp6/q6afe-clocks.c b/sound/soc/qcom/qdsp6/q6afe-clocks.c index 2967f4546af5..e652a69869f9 100644 --- a/sound/soc/qcom/qdsp6/q6afe-clocks.c +++ b/sound/soc/qcom/qdsp6/q6afe-clocks.c @@ -260,7 +260,7 @@ MODULE_DEVICE_TABLE(of, q6afe_clock_device_id); static struct platform_driver q6afe_clock_platform_driver = { .driver = { .name = "q6afe-clock", - .of_match_table = of_match_ptr(q6afe_clock_device_id), + .of_match_table = q6afe_clock_device_id }, .probe = q6afe_clock_dev_probe, }; diff --git a/sound/soc/qcom/qdsp6/q6afe-dai.c b/sound/soc/qcom/qdsp6/q6afe-dai.c index d58b86a98114..ce39d97bbc13 100644 --- a/sound/soc/qcom/qdsp6/q6afe-dai.c +++ b/sound/soc/qcom/qdsp6/q6afe-dai.c @@ -1698,7 +1698,7 @@ MODULE_DEVICE_TABLE(of, q6afe_dai_device_id); static struct platform_driver q6afe_dai_platform_driver = { .driver = { .name = "q6afe-dai", - .of_match_table = of_match_ptr(q6afe_dai_device_id), + .of_match_table = q6afe_dai_device_id }, .probe = q6afe_dai_dev_probe, }; diff --git a/sound/soc/qcom/qdsp6/q6afe.c b/sound/soc/qcom/qdsp6/q6afe.c index 688878a002a4..bce4b2134c0a 100644 --- a/sound/soc/qcom/qdsp6/q6afe.c +++ b/sound/soc/qcom/qdsp6/q6afe.c @@ -1762,7 +1762,7 @@ static struct apr_driver qcom_q6afe_driver = { .callback = q6afe_callback, .driver = { .name = "qcom-q6afe", - .of_match_table = of_match_ptr(q6afe_device_id), + .of_match_table = q6afe_device_id, }, }; diff --git a/sound/soc/qcom/qdsp6/q6asm-dai.c b/sound/soc/qcom/qdsp6/q6asm-dai.c index a1dd31f306ce..28f056c404bb 100644 --- a/sound/soc/qcom/qdsp6/q6asm-dai.c +++ b/sound/soc/qcom/qdsp6/q6asm-dai.c @@ -1343,7 +1343,7 @@ MODULE_DEVICE_TABLE(of, q6asm_dai_device_id); static struct platform_driver q6asm_dai_platform_driver = { .driver = { .name = "q6asm-dai", - .of_match_table = of_match_ptr(q6asm_dai_device_id), + .of_match_table = q6asm_dai_device_id, }, .probe = q6asm_dai_probe, }; diff --git a/sound/soc/qcom/qdsp6/q6asm.c b/sound/soc/qcom/qdsp6/q6asm.c index d745a02fcd5f..34a6e894242e 100644 --- a/sound/soc/qcom/qdsp6/q6asm.c +++ b/sound/soc/qcom/qdsp6/q6asm.c @@ -1745,7 +1745,7 @@ static struct apr_driver qcom_q6asm_driver = { .callback = q6asm_srvc_callback, .driver = { .name = "qcom-q6asm", - .of_match_table = of_match_ptr(q6asm_device_id), + .of_match_table = q6asm_device_id, }, }; diff --git a/sound/soc/qcom/qdsp6/q6core.c b/sound/soc/qcom/qdsp6/q6core.c index ae314a652efe..99fe36447525 100644 --- a/sound/soc/qcom/qdsp6/q6core.c +++ b/sound/soc/qcom/qdsp6/q6core.c @@ -366,7 +366,7 @@ static struct apr_driver qcom_q6core_driver = { .callback = q6core_callback, .driver = { .name = "qcom-q6core", - .of_match_table = of_match_ptr(q6core_device_id), + .of_match_table = q6core_device_id }, }; diff --git a/sound/soc/qcom/qdsp6/q6routing.c b/sound/soc/qcom/qdsp6/q6routing.c index b12539fae6ed..cc731c19a8ab 100644 --- a/sound/soc/qcom/qdsp6/q6routing.c +++ b/sound/soc/qcom/qdsp6/q6routing.c @@ -1152,7 +1152,7 @@ MODULE_DEVICE_TABLE(of, q6pcm_routing_device_id); static struct platform_driver q6pcm_routing_platform_driver = { .driver = { .name = "q6routing", - .of_match_table = of_match_ptr(q6pcm_routing_device_id), + .of_match_table = q6pcm_routing_device_id, }, .probe = q6pcm_routing_probe, .remove = q6pcm_routing_remove,
The of_device_id is included unconditionally by of.h header and used in the driver as well. Remove of_match_ptr to fix W=1 compile test warning with !CONFIG_OF: sound/soc/qcom/qdsp6/q6afe-clocks.c:254:34: warning: unused variable 'q6afe_clock_device_id' [-Wunused-const-variable] Fix this warning for all qdsp6 drivers. Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> --- 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 | 2 +- sound/soc/qcom/qdsp6/q6core.c | 2 +- sound/soc/qcom/qdsp6/q6routing.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-)