diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-22 10:02:45 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-22 10:02:45 +0100 |
| commit | 3634a4a80f3d3d89545f04dd0145736a50c53659 (patch) | |
| tree | cc83750b52c01273e50427bf03ef6d96179b88a1 /drivers/fpga/ts73xx-fpga.c | |
| parent | 559e575a8946a6561dfe8880de341d4ef78d5994 (diff) | |
| parent | 28910cee898c2a43fcdd8c26e1378ae8084a93a0 (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/ts73xx-fpga.c')
| -rw-r--r-- | drivers/fpga/ts73xx-fpga.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/fpga/ts73xx-fpga.c b/drivers/fpga/ts73xx-fpga.c index 9a17fe98c1b0..2888ff000e4d 100644 --- a/drivers/fpga/ts73xx-fpga.c +++ b/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); |