fpga: fpga-mgr: altera-pr-ip: Simplify registration

Simplify registration using new devm_fpga_mgr_register() API.

Reviewed-by: Tom Rix <[email protected]>
Signed-off-by: Moritz Fischer <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/fpga/altera-pr-ip-core-plat.c b/drivers/fpga/altera-pr-ip-core-plat.c
index 99b9cc0e70f08fbf462310f6eb822712cc807757..b008a6b8d2d3a82f3b78e68ddeff94da9a410d9a 100644 (file)
--- a/drivers/fpga/altera-pr-ip-core-plat.c
+++ b/drivers/fpga/altera-pr-ip-core-plat.c
@@ -28,15 +28,6 @@ static int alt_pr_platform_probe(struct platform_device *pdev)
        return alt_pr_register(dev, reg_base);
 }
 
-static int alt_pr_platform_remove(struct platform_device *pdev)
-{
-       struct device *dev = &pdev->dev;
-
-       alt_pr_unregister(dev);
-
-       return 0;
-}
-
 static const struct of_device_id alt_pr_of_match[] = {
        { .compatible = "altr,a10-pr-ip", },
        {},
@@ -46,7 +37,6 @@ MODULE_DEVICE_TABLE(of, alt_pr_of_match);
 
 static struct platform_driver alt_pr_platform_driver = {
        .probe = alt_pr_platform_probe,
-       .remove = alt_pr_platform_remove,
        .driver = {
                .name   = "alt_a10_pr_ip",
                .of_match_table = alt_pr_of_match,

diff --git a/drivers/fpga/altera-pr-ip-core.c b/drivers/fpga/altera-pr-ip-core.c
index 2cf25fd5e897957ac4582cfdd8f832669909d52a..5b130c4d988299c1869116a2811a9f56a7fad14a 100644 (file)
--- a/drivers/fpga/altera-pr-ip-core.c
+++ b/drivers/fpga/altera-pr-ip-core.c
@@ -195,9 +195,7 @@ int alt_pr_register(struct device *dev, void __iomem *reg_base)
        if (!mgr)
                return -ENOMEM;
 
-       dev_set_drvdata(dev, mgr);
-
-       return fpga_mgr_register(mgr);
+       return devm_fpga_mgr_register(dev, mgr);
 }
 EXPORT_SYMBOL_GPL(alt_pr_register);