Commit 2630fa8d authored by Moritz Fischer's avatar Moritz Fischer Committed by Greg Kroah-Hartman
Browse files

fpga: fpga-mgr: zynqmp: Simplify registration 



Simplify registration using new devm_fpga_mgr_register() API.

Reviewed-by: default avatarTom Rix <trix@redhat.com>
Signed-off-by: default avatarMoritz Fischer <mdf@kernel.org>
Link: https://lore.kernel.org/r/20201115195127.284487-10-mdf@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f4ce435b

drivers/fpga/zynqmp-fpga.c

+1 −20
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ static int zynqmp_fpga_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct zynqmp_fpga_priv *priv;

	struct fpga_manager *mgr;

	int ret;



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

	if (!priv)
@@ -108,24 +107,7 @@ static int zynqmp_fpga_probe(struct platform_device *pdev) 
	if (!mgr)

		return -ENOMEM;



	platform_set_drvdata(pdev, mgr);



	ret = fpga_mgr_register(mgr);

	if (ret) {

		dev_err(dev, "unable to register FPGA manager");

		return ret;

	}



	return 0;

}



static int zynqmp_fpga_remove(struct platform_device *pdev)

{

	struct fpga_manager *mgr = platform_get_drvdata(pdev);



	fpga_mgr_unregister(mgr);



	return 0;

	return devm_fpga_mgr_register(dev, mgr);

}



static const struct of_device_id zynqmp_fpga_of_match[] = {
@@ -137,7 +119,6 @@ MODULE_DEVICE_TABLE(of, zynqmp_fpga_of_match); 


static struct platform_driver zynqmp_fpga_driver = {

	.probe = zynqmp_fpga_probe,

	.remove = zynqmp_fpga_remove,

	.driver = {

		.name = "zynqmp_fpga_manager",

		.of_match_table = of_match_ptr(zynqmp_fpga_of_match),