Merge tag 'fpga-for-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga into char-misc-next

Xu writes:

FPGA Manager changes for 6.6-rc1

- Marco's change fixes kernel-doc warnings.
- Yangtao's change converts to use devm_platform_ioremap_resource().
- Peter's change uses HWMON defined Macros for HWMON interfaces support.
- Rob's change explicitly includes correct DT includes.
- Marco's change adds KUnit tests for FPGA core.
- Xiongfeng's change converts to use pci_find_vsec_capability().
- Ivan's change makes fpga_xxx_class a static const structure.

All patches have been reviewed on the mailing list, and have been in the
last linux-next releases (as part of our for-next branch).

Signed-off-by: Xu Yilun <yilun.xu@intel.com>

* tag 'fpga-for-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga:
  fpga: region: make fpga_region_class a static const structure
  fpga: fpga-mgr: make fpga_mgr_class a static const structure
  fpga: bridge: make fpga_bridge_class a static const structure
  fpga: dfl-pci: Use pci_find_vsec_capability() to simplify the code
  fpga: add configuration for the FPGA KUnit test suites.
  fpga: add an initial KUnit suite for the FPGA Region
  fpga: add an initial KUnit suite for the FPGA Bridge
  fpga: add an initial KUnit suite for the FPGA Manager
  fpga: Explicitly include correct DT includes
  fpga: socfpga-a10: Convert to devm_platform_ioremap_resource()
  fpga: fpga-mgr: altera-pr-ip: Convert to devm_platform_ioremap_resource()
  fpga: zynq-fpga: Convert to devm_platform_ioremap_resource()
  fpga: fpga-mgr: ts73xx: Convert to devm_platform_ioremap_resource()
  fpga: fpga-mgr: socfpga: Convert to devm_platform_ioremap_resource()
  fpga: xilinx-pr-decoupler: Convert to devm_platform_ioremap_resource()
  fpga: dfl-fme-mgr: Convert to devm_platform_ioremap_resource()
  fpga: bridge: Convert to devm_platform_ioremap_resource()
  fpga: bridge: fix kernel-doc
  fpga: region: fix kernel-doc
  fpga: dfl: fme: use SI unit prefix macros

1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/fpga/socfpga.c b/drivers/fpga/socfpga.c
index 7e0741f99696..723ea0ad3f09 100644
--- a/drivers/fpga/socfpga.c
+++ b/drivers/fpga/socfpga.c
@@ -545,20 +545,17 @@ static int socfpga_fpga_probe(struct platform_device *pdev)
 	struct device *dev = &pdev->dev;
 	struct socfpga_fpga_priv *priv;
 	struct fpga_manager *mgr;
-	struct resource *res;
 	int ret;
 
 	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
 	if (!priv)
 		return -ENOMEM;
 
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	priv->fpga_base_addr = devm_ioremap_resource(dev, res);
+	priv->fpga_base_addr = devm_platform_ioremap_resource(pdev, 0);
 	if (IS_ERR(priv->fpga_base_addr))
 		return PTR_ERR(priv->fpga_base_addr);
 
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-	priv->fpga_data_addr = devm_ioremap_resource(dev, res);
+	priv->fpga_data_addr = devm_platform_ioremap_resource(pdev, 1);
 	if (IS_ERR(priv->fpga_data_addr))
 		return PTR_ERR(priv->fpga_data_addr);