Commit 213befe0 authored by Alan Tull's avatar Alan Tull Committed by Greg Kroah-Hartman
Browse files

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: default avatarAlan Tull <atull@kernel.org>
Suggested-by: default avatarFederico Vaga <federico.vaga@cern.ch>
Acked-by: default avatarMoritz Fischer <mdf@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 084181fe

Documentation/driver-api/fpga/fpga-bridge.rst

+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ API to implement a new FPGA bridge 
.. kernel-doc:: include/linux/fpga/fpga-bridge.h

   :functions: fpga_bridge_ops



.. kernel-doc:: drivers/fpga/fpga-bridge.c

   :functions: devm_fpga_bridge_create



.. kernel-doc:: drivers/fpga/fpga-bridge.c

   :functions: fpga_bridge_create

drivers/fpga/altera-fpga2sdram.c

+3 −5
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev) 
	/* Get f2s bridge configuration saved in handoff register */

	regmap_read(sysmgr, SYSMGR_ISWGRP_HANDOFF3, &priv->mask);



	br = fpga_bridge_create(dev, F2S_BRIDGE_NAME,

	br = devm_fpga_bridge_create(dev, F2S_BRIDGE_NAME,

				     &altera_fpga2sdram_br_ops, priv);

	if (!br)

		return -ENOMEM;
@@ -129,10 +129,8 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, br);



	ret = fpga_bridge_register(br);

	if (ret) {

		fpga_bridge_free(br);

	if (ret)

		return ret;

	}



	dev_info(dev, "driver initialized with handoff %08x\n", priv->mask);

drivers/fpga/altera-freeze-bridge.c

+3 −10
Original line number Diff line number Diff line
@@ -213,7 +213,6 @@ static int altera_freeze_br_probe(struct platform_device *pdev) 
	struct fpga_bridge *br;

	struct resource *res;

	u32 status, revision;

	int ret;



	if (!np)

		return -ENODEV;
@@ -245,20 +244,14 @@ static int altera_freeze_br_probe(struct platform_device *pdev) 


	priv->base_addr = base_addr;



	br = fpga_bridge_create(dev, FREEZE_BRIDGE_NAME,

	br = devm_fpga_bridge_create(dev, FREEZE_BRIDGE_NAME,

				     &altera_freeze_br_br_ops, priv);

	if (!br)

		return -ENOMEM;



	platform_set_drvdata(pdev, br);



	ret = fpga_bridge_register(br);

	if (ret) {

		fpga_bridge_free(br);

		return ret;

	}



	return 0;

	return fpga_bridge_register(br);

}



static int altera_freeze_br_remove(struct platform_device *pdev)

drivers/fpga/altera-hps2fpga.c

+3 −4
Original line number Diff line number Diff line
@@ -180,7 +180,8 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev) 
		}

	}



	br = fpga_bridge_create(dev, priv->name, &altera_hps2fpga_br_ops, priv);

	br = devm_fpga_bridge_create(dev, priv->name,

				     &altera_hps2fpga_br_ops, priv);

	if (!br) {

		ret = -ENOMEM;

		goto err;
@@ -190,12 +191,10 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev) 


	ret = fpga_bridge_register(br);

	if (ret)

		goto err_free;

		goto err;



	return 0;



err_free:

	fpga_bridge_free(br);

err:

	clk_disable_unprepare(priv->clk);

drivers/fpga/dfl-fme-br.c

+3 −8
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ static int fme_br_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct fme_br_priv *priv;

	struct fpga_bridge *br;

	int ret;



	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);

	if (!priv)
@@ -69,18 +68,14 @@ static int fme_br_probe(struct platform_device *pdev) 


	priv->pdata = dev_get_platdata(dev);



	br = fpga_bridge_create(dev, "DFL FPGA FME Bridge",

	br = devm_fpga_bridge_create(dev, "DFL FPGA FME Bridge",

				     &fme_bridge_ops, priv);

	if (!br)

		return -ENOMEM;



	platform_set_drvdata(pdev, br);



	ret = fpga_bridge_register(br);

	if (ret)

		fpga_bridge_free(br);



	return ret;

	return fpga_bridge_register(br);

}



static int fme_br_remove(struct platform_device *pdev)

CRA Git | Maintained and supported by SUSTech CRA and CCSE