clk: ralink: mtmips: quiet unused variable warning
Subsystems (2)
Sergio Paracuellos
maintainerPATCH v2 1/1 clk: ralink: mtmips: quiet unused variable warning
When CONFIG_OF is disabled then the matching table is not referenced and the following warning appears:
drivers/clk/ralink/clk-mtmips.c:821:34: warning: unused variable 'mtmips_of_match' [-Wunused-const-variable]
821 | static const struct of_device_id mtmips_of_match[] = {
| ^
There are two match tables in the driver: one for the clock driver and the other for the reset driver. The only difference between them is that the clock driver uses 'data' and does not have 'ralink,rt2880-reset' compatible. Both just can be merged into a single one just by adding the compatible 'ralink,rt2880-reset' entry to 'mtmips_of_match[]', which will allow it to be used for 'mtmips_clk_driver' (which doesn't use the data) as well as for 'mtmips_clk_init()' (which doesn't need get called for 'ralink,rt2880-reset').
Doing in this way ensures that 'CONFIG_OF' is not disabled anymore so the above warning disapears.
---
Changes in v2:
- Merge two match tables into one to properly avoid this warning.
PATCH in v1: https://lore.kernel.org/lkml/[email protected]/T/
drivers/clk/ralink/clk-mtmips.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-)
drivers/clk/ralink/clk-mtmips.c +5 -15
@@ -821,6 +821,10 @@ static const struct mtmips_clk_data mt76x8_clk_data = { };static const struct of_device_id mtmips_of_match[] = { + { + .compatible ="ralink,rt2880-reset" , + .data =NULL , + }, { .compatible ="ralink,rt2880-sysc" , .data = &rt2880_clk_data,
@@ -1088,25 +1092,11 @@ static int mtmips_clk_probe(struct platform_device *pdev)return 0 ; } -static const struct of_device_id mtmips_clk_of_match[] = { - { .compatible ="ralink,rt2880-reset" }, - { .compatible ="ralink,rt2880-sysc" }, - { .compatible ="ralink,rt3050-sysc" }, - { .compatible ="ralink,rt3052-sysc" }, - { .compatible ="ralink,rt3352-sysc" }, - { .compatible ="ralink,rt3883-sysc" }, - { .compatible ="ralink,rt5350-sysc" }, - { .compatible ="ralink,mt7620-sysc" }, - { .compatible ="ralink,mt7628-sysc" }, - { .compatible ="ralink,mt7688-sysc" }, - {} -}; -static struct platform_driver mtmips_clk_driver = { .probe = mtmips_clk_probe, .driver = { .name ="mtmips-clk" , - .of_match_table = mtmips_clk_of_match, + .of_match_table = mtmips_of_match, }, };
Signature · 1 line
2.25.1
Sergio Paracuellos
maintainerQuoted 76 lines · Sergio Paracuellos
When
CONFIG_OFis disabled then the matching table is not referenced and the following warning appears:
drivers/clk/ralink/clk-mtmips.c:821:34: warning: unused variable 'mtmips_of_match' [-Wunused-const-variable]
821 | static const structof_device_idmtmips_of_match[] = {
| ^There are two match tables in the driver: one for the clock driver and the other for the reset driver. The only difference between them is that the clock driver uses 'data' and does not have 'ralink,rt2880-reset' compatible. Both just can be merged into a single one just by adding the compatible 'ralink,rt2880-reset' entry to 'mtmips_of_match[]', which will allow it to be used for '
mtmips_clk_driver' (which doesn't use the data) as well as for 'mtmips_clk_init()' (which doesn't need get called for 'ralink,rt2880-reset').Doing in this way ensures that '
CONFIG_OF' is not disabled anymore so the above warning disapears.Fixes 6f3b15586eef ("clk: ralink: add clock and reset driver for MTMIPS SoCs")Reported-by kernel test robot <[email protected]>Suggested-by Arnd Bergmann <[email protected]>Signed-off-by Sergio Paracuellos <[email protected]>---
Changes in v2:
- Merge two match tables into one to properly avoid this warning.PATCH in v1: https://lore.kernel.org/lkml/[email protected]/T/
drivers/clk/ralink/clk-mtmips.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-)drivers/clk/ralink/clk-mtmips.c +5
-16@@ -821,6 +821,10 @@ static const struct mtmips_clk_data mt76x8_clk_data = { };static const struct of_device_id mtmips_of_match[] = { + { + .compatible ="ralink,rt2880-reset" , + .data =NULL , + }, { .compatible ="ralink,rt2880-sysc" , .data = &rt2880_clk_data,@@ -1088,25 +1092,11 @@ static int mtmips_clk_probe(struct platform_device *pdev)return 0 ; } -static const struct of_device_id mtmips_clk_of_match[] = { - { .compatible ="ralink,rt2880-reset" }, - { .compatible ="ralink,rt2880-sysc" }, - { .compatible ="ralink,rt3050-sysc" }, - { .compatible ="ralink,rt3052-sysc" }, - { .compatible ="ralink,rt3352-sysc" }, - { .compatible ="ralink,rt3883-sysc" }, - { .compatible ="ralink,rt5350-sysc" }, - { .compatible ="ralink,mt7620-sysc" }, - { .compatible ="ralink,mt7628-sysc" }, - { .compatible ="ralink,mt7688-sysc" }, - {} -}; -static struct platform_driver mtmips_clk_driver = { .probe = mtmips_clk_probe, .driver = { .name ="mtmips-clk" , - .of_match_table = mtmips_clk_of_match, + .of_match_table = mtmips_of_match, }, }; --
Quoted 2 lines
2.25.1
Gentle ping for this patch.
Thanks,
Sergio Paracuellos
Quoted 15 lines · Sergio Paracuellos
When
CONFIG_OFis disabled then the matching table is not referenced and the following warning appears:
drivers/clk/ralink/clk-mtmips.c:821:34: warning: unused variable 'mtmips_of_match' [-Wunused-const-variable]
821 | static const structof_device_idmtmips_of_match[] = {
| ^There are two match tables in the driver: one for the clock driver and the other for the reset driver. The only difference between them is that the clock driver uses 'data' and does not have 'ralink,rt2880-reset' compatible. Both just can be merged into a single one just by adding the compatible 'ralink,rt2880-reset' entry to 'mtmips_of_match[]', which will allow it to be used for '
mtmips_clk_driver' (which doesn't use the data) as well as for 'mtmips_clk_init()' (which doesn't need get called for 'ralink,rt2880-reset').
Quoted 8 lines
Doing in this way ensures that '
CONFIG_OF' is not disabled anymore so the above warning disapears.Fixes 6f3b15586eef ("clk: ralink: add clock and reset driver for MTMIPS SoCs")Reported-by kernel test robot <[email protected]>Suggested-by Arnd Bergmann <[email protected]>Signed-off-by Sergio Paracuellos <[email protected]>
Quoted 54 lines
---
Changes in v2:
- Merge two match tables into one to properly avoid this warning.PATCH in v1: https://lore.kernel.org/lkml/[email protected]/T/
drivers/clk/ralink/clk-mtmips.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-)drivers/clk/ralink/clk-mtmips.c +5
-15@@ -821,6 +821,10 @@ static const struct mtmips_clk_data mt76x8_clk_data = { };static const struct of_device_id mtmips_of_match[] = { + { + .compatible ="ralink,rt2880-reset" , + .data =NULL , + }, { .compatible ="ralink,rt2880-sysc" , .data = &rt2880_clk_data,@@ -1088,25 +1092,11 @@ static int mtmips_clk_probe(struct platform_device *pdev)return 0 ; } -static const struct of_device_id mtmips_clk_of_match[] = { - { .compatible ="ralink,rt2880-reset" }, - { .compatible ="ralink,rt2880-sysc" }, - { .compatible ="ralink,rt3050-sysc" }, - { .compatible ="ralink,rt3052-sysc" }, - { .compatible ="ralink,rt3352-sysc" }, - { .compatible ="ralink,rt3883-sysc" }, - { .compatible ="ralink,rt5350-sysc" }, - { .compatible ="ralink,mt7620-sysc" }, - { .compatible ="ralink,mt7628-sysc" }, - { .compatible ="ralink,mt7688-sysc" }, - {} -}; -static struct platform_driver mtmips_clk_driver = { .probe = mtmips_clk_probe, .driver = { .name ="mtmips-clk" , - .of_match_table = mtmips_clk_of_match, + .of_match_table = mtmips_of_match, }, };Signature · 1 line
2.25.1
Sergio Paracuellos
maintainerQuoted 20 lines · Nathan Chancellor
Quoted 18 lines · Sergio Paracuellos
When
CONFIG_OFis disabled then the matching table is not referenced and the following warning appears:
drivers/clk/ralink/clk-mtmips.c:821:34: warning: unused variable 'mtmips_of_match' [-Wunused-const-variable]
821 | static const structof_device_idmtmips_of_match[] = {
| ^There are two match tables in the driver: one for the clock driver and the other for the reset driver. The only difference between them is that the clock driver uses 'data' and does not have 'ralink,rt2880-reset' compatible. Both just can be merged into a single one just by adding the compatible 'ralink,rt2880-reset' entry to 'mtmips_of_match[]', which will allow it to be used for '
mtmips_clk_driver' (which doesn't use the data) as well as for 'mtmips_clk_init()' (which doesn't need get called for 'ralink,rt2880-reset').Doing in this way ensures that '
CONFIG_OF' is not disabled anymore so the above warning disapears.
Quoted 7 lines
Quoted 5 lines
Fixes 6f3b15586eef ("clk: ralink: add clock and reset driver for MTMIPS SoCs")Reported-by kernel test robot <[email protected]>Suggested-by Arnd Bergmann <[email protected]>Signed-off-by Sergio Paracuellos <[email protected]>Reviewed-by Nathan Chancellor <[email protected]>
Thanks, Nathan!
Best regards,
Sergio Paracuellos
Quoted 55 lines
Quoted 55 lines
---
Changes in v2:
- Merge two match tables into one to properly avoid this warning.PATCH in v1: https://lore.kernel.org/lkml/[email protected]/T/
drivers/clk/ralink/clk-mtmips.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-)drivers/clk/ralink/clk-mtmips.c +5
-16@@ -821,6 +821,10 @@ static const struct mtmips_clk_data mt76x8_clk_data = { };static const struct of_device_id mtmips_of_match[] = { + { + .compatible ="ralink,rt2880-reset" , + .data =NULL , + }, { .compatible ="ralink,rt2880-sysc" , .data = &rt2880_clk_data,@@ -1088,25 +1092,11 @@ static int mtmips_clk_probe(struct platform_device *pdev)return 0 ; } -static const struct of_device_id mtmips_clk_of_match[] = { - { .compatible ="ralink,rt2880-reset" }, - { .compatible ="ralink,rt2880-sysc" }, - { .compatible ="ralink,rt3050-sysc" }, - { .compatible ="ralink,rt3052-sysc" }, - { .compatible ="ralink,rt3352-sysc" }, - { .compatible ="ralink,rt3883-sysc" }, - { .compatible ="ralink,rt5350-sysc" }, - { .compatible ="ralink,mt7620-sysc" }, - { .compatible ="ralink,mt7628-sysc" }, - { .compatible ="ralink,mt7688-sysc" }, - {} -}; -static struct platform_driver mtmips_clk_driver = { .probe = mtmips_clk_probe, .driver = { .name ="mtmips-clk" , - .of_match_table = mtmips_clk_of_match, + .of_match_table = mtmips_of_match, }, }; --2.25.1
Quoting Sergio Paracuellos (2023-08-26 19:39:32)
Quoted 18 lines
When
CONFIG_OFis disabled then the matching table is not referenced and the following warning appears:
drivers/clk/ralink/clk-mtmips.c:821:34: warning: unused variable 'mtmips_of_match' [-Wunused-const-variable]
821 | static const structof_device_idmtmips_of_match[] = {
| ^There are two match tables in the driver: one for the clock driver and the other for the reset driver. The only difference between them is that the clock driver uses 'data' and does not have 'ralink,rt2880-reset' compatible. Both just can be merged into a single one just by adding the compatible 'ralink,rt2880-reset' entry to 'mtmips_of_match[]', which will allow it to be used for '
mtmips_clk_driver' (which doesn't use the data) as well as for 'mtmips_clk_init()' (which doesn't need get called for 'ralink,rt2880-reset').Doing in this way ensures that '
CONFIG_OF' is not disabled anymore so the above warning disapears.
Quoted 6 lines
Fixes 6f3b15586eef ("clk: ralink: add clock and reset driver for MTMIPS SoCs")Reported-by kernel test robot <[email protected]>Suggested-by Arnd Bergmann <[email protected]>Signed-off-by Sergio Paracuellos <[email protected]>---
Applied to clk-next
Sergio Paracuellos
maintainerQuoted 20 lines · Stephen Boyd
Quoting Sergio Paracuellos (2023-08-26 19:39:32)
Quoted 18 lines
When
CONFIG_OFis disabled then the matching table is not referenced and the following warning appears:
drivers/clk/ralink/clk-mtmips.c:821:34: warning: unused variable 'mtmips_of_match' [-Wunused-const-variable]
821 | static const structof_device_idmtmips_of_match[] = {
| ^There are two match tables in the driver: one for the clock driver and the other for the reset driver. The only difference between them is that the clock driver uses 'data' and does not have 'ralink,rt2880-reset' compatible. Both just can be merged into a single one just by adding the compatible 'ralink,rt2880-reset' entry to 'mtmips_of_match[]', which will allow it to be used for '
mtmips_clk_driver' (which doesn't use the data) as well as for 'mtmips_clk_init()' (which doesn't need get called for 'ralink,rt2880-reset').Doing in this way ensures that '
CONFIG_OF' is not disabled anymore so the above warning disapears.
Quoted 8 lines
Quoted 6 lines
Fixes 6f3b15586eef ("clk: ralink: add clock and reset driver for MTMIPS SoCs")Reported-by kernel test robot <[email protected]>Suggested-by Arnd Bergmann <[email protected]>Signed-off-by Sergio Paracuellos <[email protected]>---
Applied to clk-next
Thanks Stephen!
Best regards,
Sergio Paracuellos