diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-11-23 19:36:19 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-11-23 19:36:19 +0100 |
| commit | e246e4691f5f3af2a2ded07f863675c7b4ef8891 (patch) | |
| tree | d7a7233d3973d2d8fbabee424e9b33da70ee763d /drivers/fpga/zynq-fpga.c | |
| parent | 210a671cc30429c7178a332b1feb5ebc2709dcd6 (diff) | |
| parent | ee31d5038c06b56ea515f4fe490274628c0f80e1 (diff) | |
Merge tag 'fpga-for-6.2-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.2-rc1
Zynq:
- Yang's change Switch to use dev_err_probe() helper
Lattice:
- Ivan's change add support for Lattice Sysconfig FPGA reprogrammer
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.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga:
dt-bindings: fpga: document Lattice sysCONFIG FPGA manager
fpga: lattice-sysconfig-spi: add Lattice sysCONFIG FPGA manager
fpga: zynq: Switch to use dev_err_probe() helper
Diffstat (limited to 'drivers/fpga/zynq-fpga.c')
| -rw-r--r-- | drivers/fpga/zynq-fpga.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/fpga/zynq-fpga.c b/drivers/fpga/zynq-fpga.c index 426aa34c6a0d..ae0da361e6c6 100644 --- a/drivers/fpga/zynq-fpga.c +++ b/drivers/fpga/zynq-fpga.c @@ -582,11 +582,9 @@ static int zynq_fpga_probe(struct platform_device *pdev) return priv->irq; priv->clk = devm_clk_get(dev, "ref_clk"); - if (IS_ERR(priv->clk)) { - if (PTR_ERR(priv->clk) != -EPROBE_DEFER) - dev_err(dev, "input clock not found\n"); - return PTR_ERR(priv->clk); - } + if (IS_ERR(priv->clk)) + return dev_err_probe(dev, PTR_ERR(priv->clk), + "input clock not found\n"); err = clk_prepare_enable(priv->clk); if (err) { |