diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2022-03-23 09:58:40 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2022-03-23 09:58:40 +0100 |
| commit | b690490d6d466972ade172ee2e7f6ffa49e7e910 (patch) | |
| tree | 50a93da28c9128e19eb7a3038aecf75dab6b36e1 /drivers/fpga/altera-hps2fpga.c | |
| parent | HID: intel-ish-hid: Use dma_alloc_coherent for firmware update (diff) | |
| parent | HID: amd_sfh: Remove useless DMA-32 fallback configuration (diff) | |
| download | wireguard-linux-b690490d6d466972ade172ee2e7f6ffa49e7e910.tar.xz wireguard-linux-b690490d6d466972ade172ee2e7f6ffa49e7e910.zip | |
Merge branch 'for-5.18/amd-sfh' into for-linus
- dead code elimination (Christophe JAILLET)
Diffstat (limited to 'drivers/fpga/altera-hps2fpga.c')
| -rw-r--r-- | drivers/fpga/altera-hps2fpga.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/fpga/altera-hps2fpga.c b/drivers/fpga/altera-hps2fpga.c index 77b95f251821..aa758426c22b 100644 --- a/drivers/fpga/altera-hps2fpga.c +++ b/drivers/fpga/altera-hps2fpga.c @@ -180,19 +180,15 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev) } } - br = devm_fpga_bridge_create(dev, priv->name, - &altera_hps2fpga_br_ops, priv); - if (!br) { - ret = -ENOMEM; + br = fpga_bridge_register(dev, priv->name, + &altera_hps2fpga_br_ops, priv); + if (IS_ERR(br)) { + ret = PTR_ERR(br); goto err; } platform_set_drvdata(pdev, br); - ret = fpga_bridge_register(br); - if (ret) - goto err; - return 0; err: |