summaryrefslogtreecommitdiff
path: root/drivers/fpga/xilinx-pr-decoupler.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-22 10:02:45 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-22 10:02:45 +0100
commit3634a4a80f3d3d89545f04dd0145736a50c53659 (patch)
treecc83750b52c01273e50427bf03ef6d96179b88a1 /drivers/fpga/xilinx-pr-decoupler.c
parent559e575a8946a6561dfe8880de341d4ef78d5994 (diff)
parent28910cee898c2a43fcdd8c26e1378ae8084a93a0 (diff)
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 <mdf@kernel.org> * 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'
Diffstat (limited to 'drivers/fpga/xilinx-pr-decoupler.c')
-rw-r--r--drivers/fpga/xilinx-pr-decoupler.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/fpga/xilinx-pr-decoupler.c b/drivers/fpga/xilinx-pr-decoupler.c
index af9b387c56d3..7d69af230567 100644
--- a/drivers/fpga/xilinx-pr-decoupler.c
+++ b/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);
}