Skip to contentSkip to conversation

fpga: xilinx-pr-decoupler: Fix unused xlnx_pr_decoupler_of_match warning for !CONFIG_OF

PATCH In review Rob Herring 3 participants 6 messages Oct 12, 2023 – Oct 20, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fpga: xilinx-pr-decoupler: Fix unused xlnx_pr_decoupler_of_match warning for !CONFIG_OF

Commit 8c966aadcc02 ("fpga: Use device_get_match_data()") dropped the unconditional use of xlnx_pr_decoupler_of_match resulting in this warning:

drivers/fpga/xilinx-pr-decoupler.c:94:34: warning: unused variable 'xlnx_pr_decoupler_of_match' [-Wunused-const-variable]

The fix is to drop of_match_ptr() which is not necessary because DT is always used for this driver.

---
 drivers/fpga/xilinx-pr-decoupler.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/fpga/xilinx-pr-decoupler.c +1 -1
index 0c012d0f616d..68835896f180 100644
@@ -167,7 +167,7 @@ static struct platform_driver xlnx_pr_decoupler_driver = {
 	.remove = xlnx_pr_decoupler_remove,
 	.driver = {
 		.name = "xlnx_pr_decoupler",
-		.of_match_table = of_match_ptr(xlnx_pr_decoupler_of_match),
+		.of_match_table = xlnx_pr_decoupler_of_match,
 	},
 };
 
Signature · 1 line
2.42.0
#1 lore raw
Quoted 1 line · Rob Herring

Commit 8c966aadcc02 ("fpga: Use device_get_match_data()") dropped the

Hi rob:

Unfortunately I re-applied Commit 8c966aadcc02 and the previous commit id is lost.

Since the 2 patches are not upstreamed yet, could I just merge them into one?

Thanks,
Yilun

Quoted 31 lines

unconditional use of xlnx_pr_decoupler_of_match resulting in this warning:

drivers/fpga/xilinx-pr-decoupler.c:94:34: warning: unused variable 'xlnx_pr_decoupler_of_match' [-Wunused-const-variable]

The fix is to drop of_match_ptr() which is not necessary because DT is always used for this driver.

---
 drivers/fpga/xilinx-pr-decoupler.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/fpga/xilinx-pr-decoupler.c +1 -1
index 0c012d0f616d..68835896f180 100644
@@ -167,7 +167,7 @@ static struct platform_driver xlnx_pr_decoupler_driver = {
 	.remove = xlnx_pr_decoupler_remove,
 	.driver = {
 		.name = "xlnx_pr_decoupler",
-		.of_match_table = of_match_ptr(xlnx_pr_decoupler_of_match),
+		.of_match_table = xlnx_pr_decoupler_of_match,
 	},
 };
 
Signature · 1 line
2.42.0
#2 lore raw
Quoted 11 lines · Xu Yilun
Quoted 1 line · Rob Herring

Commit 8c966aadcc02 ("fpga: Use device_get_match_data()") dropped the

Hi rob:

Unfortunately I re-applied Commit 8c966aadcc02 and the previous commit id is lost.

Since the 2 patches are not upstreamed yet, could I just merge them into one?

Yes, that's fine.

Rob

Quoted 35 lines

Thanks,
Yilun

Quoted 31 lines

unconditional use of xlnx_pr_decoupler_of_match resulting in this warning:

drivers/fpga/xilinx-pr-decoupler.c:94:34: warning: unused variable 'xlnx_pr_decoupler_of_match' [-Wunused-const-variable]

The fix is to drop of_match_ptr() which is not necessary because DT is always used for this driver.

---
 drivers/fpga/xilinx-pr-decoupler.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/fpga/xilinx-pr-decoupler.c +1 -2
index 0c012d0f616d..68835896f180 100644
@@ -167,7 +167,7 @@ static struct platform_driver xlnx_pr_decoupler_driver = {
      .remove = xlnx_pr_decoupler_remove,
      .driver = {
              .name = "xlnx_pr_decoupler",
-             .of_match_table = of_match_ptr(xlnx_pr_decoupler_of_match),
+             .of_match_table = xlnx_pr_decoupler_of_match,
      },
 };
 
--

2.42.0

#3 lore raw
Quoted 8 lines · Rob Herring
Quoted 6 lines · Xu Yilun
Quoted 1 line · Rob Herring

Commit 8c966aadcc02 ("fpga: Use device_get_match_data()") dropped the

Hi rob:

Quoted 7 lines
Quoted 5 lines

Unfortunately I re-applied Commit 8c966aadcc02 and the previous commit id is lost.

Since the 2 patches are not upstreamed yet, could I just merge them into one?

Yes, that's fine.

Looks like altera-ps-spi.c also needs the same fix. Do you mind making the same change there?

Rob

#4 lore raw
Quoted 12 lines · Rob Herring
Quoted 11 lines · Rob Herring
Quoted 9 lines · Xu Yilun
Quoted 1 line · Rob Herring

Commit 8c966aadcc02 ("fpga: Use device_get_match_data()") dropped the

Hi rob:

Unfortunately I re-applied Commit 8c966aadcc02 and the previous commit id is lost.

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

Since the 2 patches are not upstreamed yet, could I just merge them into one?

Yes, that's fine.

Looks like altera-ps-spi.c also needs the same fix. Do you mind making the same change there?

Fixed & applied.

Thanks,
Yilun

Quoted 2 lines

Rob

#5 lore raw
In reply to Rob Herring
kernel test robot noticed the following build errors:

Hi Rob,

kernel test robot noticed the following build errors:

[auto build test ERROR on xilinx-xlnx/master]
[also build test ERROR on linus/master v6.6-rc6]
[cannot apply to next-20231019]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Rob-Herring/fpga-xilinx-pr-decoupler-Fix-unused-xlnx_pr_decoupler_of_match-warning-for-CONFIG_OF/20231017-112523
base:   https://github.com/Xilinx/linux-xlnx master
patch link:    https://lore.kernel.org/r/20231012192149.1546368-1-robh%40kernel.org
patch subject: [PATCH] fpga: xilinx-pr-decoupler: Fix unused xlnx_pr_decoupler_of_match warning for !CONFIG_OF
config: parisc-randconfig-002-20231019 (https://download.01.org/0day-ci/archive/20231020/[email protected]/config)
compiler: hppa-linux-gcc (GCC) 13.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231020/[email protected]/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/

All errors (new ones prefixed by >>):

>> drivers/fpga/xilinx-pr-decoupler.c:179:35: error: 'xlnx_pr_decoupler_of_match' undeclared here (not in a function); did you mean 'xlnx_pr_decoupler_data'?
     179 |                 .of_match_table = xlnx_pr_decoupler_of_match,
         |                                   ^~~~~~~~~~~~~~~~~~~~~~~~~~
         |                                   xlnx_pr_decoupler_data

vim +179 drivers/fpga/xilinx-pr-decoupler.c

173
174 static struct platform_driver xlnx_pr_decoupler_driver = {
175 .probe = xlnx_pr_decoupler_probe,
176 .remove = xlnx_pr_decoupler_remove,
177 .driver = {
178 .name = "xlnx_pr_decoupler",

 > 179			.of_match_table = xlnx_pr_decoupler_of_match,

180 },
181 };
182

Signature · 2 lines
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki