diff options
author | Alan Tull <atull@kernel.org> | 2018-10-15 18:20:02 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-16 05:13:50 -0400 |
commit | 213befe049c70cfcfcbb4f6010bd5276dbc1f7b9 (patch) | |
tree | aec320c32e568e2b05b4a9280c45f1e3e6b7daaa /drivers/fpga/altera-fpga2sdram.c | |
parent | 084181fe8cc7472695b907f0018f4cd00934cb12 (diff) |
fpga: bridge: add devm_fpga_bridge_create
Add devm_fpga_bridge_create() which is the managed
version of fpga_bridge_create().
Change current bridge drivers to use
devm_fpga_bridge_create().
Signed-off-by: Alan Tull <atull@kernel.org>
Suggested-by: Federico Vaga <federico.vaga@cern.ch>
Acked-by: Moritz Fischer <mdf@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/fpga/altera-fpga2sdram.c')
-rw-r--r-- | drivers/fpga/altera-fpga2sdram.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/fpga/altera-fpga2sdram.c b/drivers/fpga/altera-fpga2sdram.c index 23660ccd634b..a78e49c63c64 100644 --- a/drivers/fpga/altera-fpga2sdram.c +++ b/drivers/fpga/altera-fpga2sdram.c | |||
@@ -121,18 +121,16 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev) | |||
121 | /* Get f2s bridge configuration saved in handoff register */ | 121 | /* Get f2s bridge configuration saved in handoff register */ |
122 | regmap_read(sysmgr, SYSMGR_ISWGRP_HANDOFF3, &priv->mask); | 122 | regmap_read(sysmgr, SYSMGR_ISWGRP_HANDOFF3, &priv->mask); |
123 | 123 | ||
124 | br = fpga_bridge_create(dev, F2S_BRIDGE_NAME, | 124 | br = devm_fpga_bridge_create(dev, F2S_BRIDGE_NAME, |
125 | &altera_fpga2sdram_br_ops, priv); | 125 | &altera_fpga2sdram_br_ops, priv); |
126 | if (!br) | 126 | if (!br) |
127 | return -ENOMEM; | 127 | return -ENOMEM; |
128 | 128 | ||
129 | platform_set_drvdata(pdev, br); | 129 | platform_set_drvdata(pdev, br); |
130 | 130 | ||
131 | ret = fpga_bridge_register(br); | 131 | ret = fpga_bridge_register(br); |
132 | if (ret) { | 132 | if (ret) |
133 | fpga_bridge_free(br); | ||
134 | return ret; | 133 | return ret; |
135 | } | ||
136 | 134 | ||
137 | dev_info(dev, "driver initialized with handoff %08x\n", priv->mask); | 135 | dev_info(dev, "driver initialized with handoff %08x\n", priv->mask); |
138 | 136 | ||