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

Moritz writes:

Here is the first set of FPGA changes for 5.6

The first two patches are minor cleanups to the DFL drivers,
that remove unused warnings.

The third patch removes a redundant error message to the ts73xx driver.

The last patch removes a confusing print in case a call to devm_clk_get
returns -EPROBE_DEFER.

All patches have been reviewed on the mailing list and have been in the
last couple of linux-next releases without issues.

Signed-off-by: Moritz Fischer <[email protected]>

* tag 'fpga-for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga:
  fpga: xilinx-pr-decoupler: Remove clk_get error message for probe defer
  fpga: remove redundant dev_err message
  fpga: dfl: afu: remove set but not used variable 'afu'
  fpga: dfl: fme: remove set but not used variable 'fme'

Author: gregkh

drivers/fpga/dfl-afu-main.c

@@ -813,10 +813,8 @@ static int afu_dev_init(struct platform_device *pdev)
 static int afu_dev_destroy(struct platform_device *pdev)
 {
 	struct dfl_feature_platform_data *pdata = dev_get_platdata(&pdev->dev);
-	struct dfl_afu *afu;
 
 	mutex_lock(&pdata->lock);
-	afu = dfl_fpga_pdata_get_private(pdata);
 	afu_mmio_region_destroy(pdata);
 	afu_dma_region_destroy(pdata);
 	dfl_fpga_pdata_set_private(pdata, NULL);

drivers/fpga/dfl-fme-main.c

@@ -675,10 +675,8 @@ static int fme_dev_init(struct platform_device *pdev)
 static void fme_dev_destroy(struct platform_device *pdev)
 {
 	struct dfl_feature_platform_data *pdata = dev_get_platdata(&pdev->dev);
-	struct dfl_fme *fme;
 
 	mutex_lock(&pdata->lock);
-	fme = dfl_fpga_pdata_get_private(pdata);
 	dfl_fpga_pdata_set_private(pdata, NULL);
 	mutex_unlock(&pdata->lock);
 }

drivers/fpga/ts73xx-fpga.c

@@ -119,10 +119,8 @@ static int ts73xx_fpga_probe(struct platform_device *pdev)
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	priv->io_base = devm_ioremap_resource(kdev, res);
-	if (IS_ERR(priv->io_base)) {
-		dev_err(kdev, "unable to remap registers\n");
+	if (IS_ERR(priv->io_base))
 		return PTR_ERR(priv->io_base);
-	}
 
 	mgr = devm_fpga_mgr_create(kdev, "TS-73xx FPGA Manager",
 				   &ts73xx_fpga_ops, priv);

drivers/fpga/xilinx-pr-decoupler.c

@@ -101,7 +101,8 @@ static int xlnx_pr_decoupler_probe(struct platform_device *pdev)
 
 	priv->clk = devm_clk_get(&pdev->dev, "aclk");
 	if (IS_ERR(priv->clk)) {
-		dev_err(&pdev->dev, "input clock not found\n");
+		if (PTR_ERR(priv->clk) != -EPROBE_DEFER)
+			dev_err(&pdev->dev, "input clock not found\n");
 		return PTR_ERR(priv->clk);
 	}