aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/fpga/altera-freeze-bridge.c
diff options
context:
space:
mode:
authorAlan Tull <atull@kernel.org>2018-10-15 18:20:02 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-16 05:13:50 -0400
commit213befe049c70cfcfcbb4f6010bd5276dbc1f7b9 (patch)
treeaec320c32e568e2b05b4a9280c45f1e3e6b7daaa /drivers/fpga/altera-freeze-bridge.c
parent084181fe8cc7472695b907f0018f4cd00934cb12 (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-freeze-bridge.c')
-rw-r--r--drivers/fpga/altera-freeze-bridge.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/fpga/altera-freeze-bridge.c b/drivers/fpga/altera-freeze-bridge.c
index ffd586c48ecf..dd58c4aea92e 100644
--- a/drivers/fpga/altera-freeze-bridge.c
+++ b/drivers/fpga/altera-freeze-bridge.c
@@ -213,7 +213,6 @@ static int altera_freeze_br_probe(struct platform_device *pdev)
213 struct fpga_bridge *br; 213 struct fpga_bridge *br;
214 struct resource *res; 214 struct resource *res;
215 u32 status, revision; 215 u32 status, revision;
216 int ret;
217 216
218 if (!np) 217 if (!np)
219 return -ENODEV; 218 return -ENODEV;
@@ -245,20 +244,14 @@ static int altera_freeze_br_probe(struct platform_device *pdev)
245 244
246 priv->base_addr = base_addr; 245 priv->base_addr = base_addr;
247 246
248 br = fpga_bridge_create(dev, FREEZE_BRIDGE_NAME, 247 br = devm_fpga_bridge_create(dev, FREEZE_BRIDGE_NAME,
249 &altera_freeze_br_br_ops, priv); 248 &altera_freeze_br_br_ops, priv);
250 if (!br) 249 if (!br)
251 return -ENOMEM; 250 return -ENOMEM;
252 251
253 platform_set_drvdata(pdev, br); 252 platform_set_drvdata(pdev, br);
254 253
255 ret = fpga_bridge_register(br); 254 return fpga_bridge_register(br);
256 if (ret) {
257 fpga_bridge_free(br);
258 return ret;
259 }
260
261 return 0;
262} 255}
263 256
264static int altera_freeze_br_remove(struct platform_device *pdev) 257static int altera_freeze_br_remove(struct platform_device *pdev)