[PATCH 0/4] FPGA Manager address unused variable warnings

[PATCH 0/4] FPGA Manager address unused variable warnings

[Moritz Fischer]

This patchset addresses a handful of warnings as result of_match_ids
being not properly wrapped in #ifdef CONFIG_OF.

Moritz Fischer (4):
  fpga: altera-freeze-bridge: Address warning about unused variable
  fpga: xiilnx-spi: Address warning about unused variable
  fpga: xilinx-pr-decoupler: Address warning about unused variable
  fpga: zynqmp-fpga: Address warning about unused variable

 drivers/fpga/altera-freeze-bridge.c | 2 ++
 drivers/fpga/xilinx-pr-decoupler.c  | 2 ++
 drivers/fpga/xilinx-spi.c           | 2 ++
 drivers/fpga/zynqmp-fpga.c          | 3 ++-
 4 files changed, 8 insertions(+), 1 deletion(-)

-- 
2.32.0

[PATCH 1/4] fpga: altera-freeze-bridge: Address warning about unused variable

[Moritz Fischer]

warning: unused variable 'altera_freeze_br_of_match'
 [-Wunused-const-variable]
  static const struct of_device_id altera_freeze_br_of_match[] = {

Fixes: ca24a648f535 ("fpga: add altera freeze bridge support")
Cc: Tom Rix <trix@redhat.com>
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Moritz Fischer <mdf@kernel.org>
---
 drivers/fpga/altera-freeze-bridge.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/fpga/altera-freeze-bridge.c b/drivers/fpga/altera-freeze-bridge.c
index dd58c4aea92e..7d22a44d652e 100644
--- a/drivers/fpga/altera-freeze-bridge.c
+++ b/drivers/fpga/altera-freeze-bridge.c
@@ -198,11 +198,13 @@ static const struct fpga_bridge_ops altera_freeze_br_br_ops = {
 	.enable_show = altera_freeze_br_enable_show,
 };
 
+#ifdef CONFIG_OF
 static const struct of_device_id altera_freeze_br_of_match[] = {
 	{ .compatible = "altr,freeze-bridge-controller", },
 	{},
 };
 MODULE_DEVICE_TABLE(of, altera_freeze_br_of_match);
+#endif
 
 static int altera_freeze_br_probe(struct platform_device *pdev)
 {
-- 
2.32.0

[PATCH 2/4] fpga: xiilnx-spi: Address warning about unused variable

[Moritz Fischer]

warning: ‘xlnx_spi_of_match’ defined but not used
 [-Wunused-const-variable]
  static const struct of_device_id xlnx_spi_of_match[] = {

Fixes: 061c97d13f1a ("fpga manager: Add Xilinx slave serial SPI driver")
Cc: Tom Rix <trix@redhat.com>
Signed-off-by: Moritz Fischer <mdf@kernel.org>
---
 drivers/fpga/xilinx-spi.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/fpga/xilinx-spi.c b/drivers/fpga/xilinx-spi.c
index fee4d0abf6bf..b6bcf1d9233d 100644
--- a/drivers/fpga/xilinx-spi.c
+++ b/drivers/fpga/xilinx-spi.c
@@ -256,11 +256,13 @@ static int xilinx_spi_probe(struct spi_device *spi)
 	return devm_fpga_mgr_register(&spi->dev, mgr);
 }
 
+#ifdef CONFIG_OF
 static const struct of_device_id xlnx_spi_of_match[] = {
 	{ .compatible = "xlnx,fpga-slave-serial", },
 	{}
 };
 MODULE_DEVICE_TABLE(of, xlnx_spi_of_match);
+#endif
 
 static struct spi_driver xilinx_slave_spi_driver = {
 	.driver = {
-- 
2.32.0

[PATCH 3/4] fpga: xilinx-pr-decoupler: Address warning about unused variable

[Moritz Fischer]

warning: ‘xlnx_pr_decoupler_of_match’ defined but not used
 [-Wunused-const-variable=]
 static const struct of_device_id xlnx_pr_decoupler_of_match[] = {

Fixes: 7e961c12be42 ("fpga: Add support for Xilinx LogiCORE PR Decoupler")
Cc: Tom Rix <trix@redhat.com>
Signed-off-by: Moritz Fischer <mdf@kernel.org>
---
 drivers/fpga/xilinx-pr-decoupler.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/fpga/xilinx-pr-decoupler.c b/drivers/fpga/xilinx-pr-decoupler.c
index ea2bde6e5bc4..e986ed47c4ed 100644
--- a/drivers/fpga/xilinx-pr-decoupler.c
+++ b/drivers/fpga/xilinx-pr-decoupler.c
@@ -81,6 +81,7 @@ static const struct fpga_bridge_ops xlnx_pr_decoupler_br_ops = {
 	.enable_show = xlnx_pr_decoupler_enable_show,
 };
 
+#ifdef CONFIG_OF
 static const struct xlnx_config_data decoupler_config = {
 	.name = "Xilinx PR Decoupler",
 };
@@ -99,6 +100,7 @@ static const struct of_device_id xlnx_pr_decoupler_of_match[] = {
 	{},
 };
 MODULE_DEVICE_TABLE(of, xlnx_pr_decoupler_of_match);
+#endif
 
 static int xlnx_pr_decoupler_probe(struct platform_device *pdev)
 {
-- 
2.32.0

[PATCH 4/4] fpga: zynqmp-fpga: Address warning about unused variable

[Moritz Fischer]

warning: ‘zynqmp_fpga_of_match’ defined but not used
 [-Wunused-const-variable=]
 static const struct of_device_id zynqmp_fpga_of_match[] = {

Fixes: c09f7471127e ("fpga manager: Adding FPGA Manager support for
Xilinx zynqmp")
Cc: Tom Rix <trix@redhat.com>
Signed-off-by: Moritz Fischer <mdf@kernel.org>
---
 drivers/fpga/zynqmp-fpga.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/fpga/zynqmp-fpga.c b/drivers/fpga/zynqmp-fpga.c
index 125743c9797f..b3240f75f0c7 100644
--- a/drivers/fpga/zynqmp-fpga.c
+++ b/drivers/fpga/zynqmp-fpga.c
@@ -110,12 +110,13 @@ static int zynqmp_fpga_probe(struct platform_device *pdev)
 	return devm_fpga_mgr_register(dev, mgr);
 }
 
+#ifdef CONFIG_OF
 static const struct of_device_id zynqmp_fpga_of_match[] = {
 	{ .compatible = "xlnx,zynqmp-pcap-fpga", },
 	{},
 };
-
 MODULE_DEVICE_TABLE(of, zynqmp_fpga_of_match);
+#endif
 
 static struct platform_driver zynqmp_fpga_driver = {
 	.probe = zynqmp_fpga_probe,
-- 
2.32.0

Re: [PATCH 0/4] FPGA Manager address unused variable warnings

[Tom Rix]

On 7/1/21 8:54 PM, Moritz Fischer wrote:
> This patchset addresses a handful of warnings as result of_match_ids
> being not properly wrapped in #ifdef CONFIG_OF.
>
> Moritz Fischer (4):
>    fpga: altera-freeze-bridge: Address warning about unused variable
>    fpga: xiilnx-spi: Address warning about unused variable
>    fpga: xilinx-pr-decoupler: Address warning about unused variable
>    fpga: zynqmp-fpga: Address warning about unused variable
>
>   drivers/fpga/altera-freeze-bridge.c | 2 ++
>   drivers/fpga/xilinx-pr-decoupler.c  | 2 ++
>   drivers/fpga/xilinx-spi.c           | 2 ++
>   drivers/fpga/zynqmp-fpga.c          | 3 ++-
>   4 files changed, 8 insertions(+), 1 deletion(-)

I am not seeing these warnings, but it is still worth doing.

I think a few more files need this change.

altera-ps-spi.c, dfl-n3000-nios.c, altera-hps2fpga.c, stratix10-soc.c, 
socfpga-a10.c, altera-fpga2sdram.c

Not needed for

altera-pr-ip-core-plat.c and ice40-spi.c

These have depends on OF in Kconfig.

Tom

Re: [PATCH 0/4] FPGA Manager address unused variable warnings

[Xu Yilun]

On Tue, Jul 06, 2021 at 09:28:37AM -0700, Tom Rix wrote:
> 
> On 7/1/21 8:54 PM, Moritz Fischer wrote:
> > This patchset addresses a handful of warnings as result of_match_ids
> > being not properly wrapped in #ifdef CONFIG_OF.
> > 
> > Moritz Fischer (4):
> >    fpga: altera-freeze-bridge: Address warning about unused variable
> >    fpga: xiilnx-spi: Address warning about unused variable
> >    fpga: xilinx-pr-decoupler: Address warning about unused variable
> >    fpga: zynqmp-fpga: Address warning about unused variable
> > 
> >   drivers/fpga/altera-freeze-bridge.c | 2 ++
> >   drivers/fpga/xilinx-pr-decoupler.c  | 2 ++
> >   drivers/fpga/xilinx-spi.c           | 2 ++
> >   drivers/fpga/zynqmp-fpga.c          | 3 ++-
> >   4 files changed, 8 insertions(+), 1 deletion(-)
> 
> I am not seeing these warnings, but it is still worth doing.
> 
> I think a few more files need this change.
> 
> altera-ps-spi.c, dfl-n3000-nios.c, altera-hps2fpga.c, stratix10-soc.c,
> socfpga-a10.c, altera-fpga2sdram.c

dfl-n3000-nios is not using of_device_id, and doesn't need the change.

Thanks,
Yilun

> 
> Not needed for
> 
> altera-pr-ip-core-plat.c and ice40-spi.c
> 
> These have depends on OF in Kconfig.
> 
> Tom

Re: [PATCH 0/4] FPGA Manager address unused variable warnings

[Moritz Fischer]

On Wed, Jul 07, 2021 at 10:03:09AM +0800, Xu Yilun wrote:
> On Tue, Jul 06, 2021 at 09:28:37AM -0700, Tom Rix wrote:
> > 
> > On 7/1/21 8:54 PM, Moritz Fischer wrote:
> > > This patchset addresses a handful of warnings as result of_match_ids
> > > being not properly wrapped in #ifdef CONFIG_OF.
> > > 
> > > Moritz Fischer (4):
> > >    fpga: altera-freeze-bridge: Address warning about unused variable
> > >    fpga: xiilnx-spi: Address warning about unused variable
> > >    fpga: xilinx-pr-decoupler: Address warning about unused variable
> > >    fpga: zynqmp-fpga: Address warning about unused variable
> > > 
> > >   drivers/fpga/altera-freeze-bridge.c | 2 ++
> > >   drivers/fpga/xilinx-pr-decoupler.c  | 2 ++
> > >   drivers/fpga/xilinx-spi.c           | 2 ++
> > >   drivers/fpga/zynqmp-fpga.c          | 3 ++-
> > >   4 files changed, 8 insertions(+), 1 deletion(-)
> > 
> > I am not seeing these warnings, but it is still worth doing.
> > 
> > I think a few more files need this change.
> > 
> > altera-ps-spi.c, dfl-n3000-nios.c, altera-hps2fpga.c, stratix10-soc.c,
> > socfpga-a10.c, altera-fpga2sdram.c
> 
> dfl-n3000-nios is not using of_device_id, and doesn't need the change.
> 
> Thanks,
> Yilun
> 
> > 
> > Not needed for
> > 
> > altera-pr-ip-core-plat.c and ice40-spi.c
> > 
> > These have depends on OF in Kconfig.
> > 
> > Tom

Applied to for-next,

Moritz