| Message ID | 20201005173735.162408-11-mdf@kernel.org (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | [v2,01/10] fpga: fpga-mgr: Add devm_fpga_mgr_register() API | expand |
On 10/5/20 10:37 AM, Moritz Fischer wrote: > Simplify registration using new devm_fpga_mgr_register() API. Should change old commit message to something about removing symbol alt_pr_platform_remove Otherwise fine. Reviewed-by: Tom Rix <trix@redhat.com> > > Signed-off-by: Moritz Fischer <mdf@kernel.org> > --- > > Changes from v1: > - Removed part that removes unused symbol > > --- > drivers/fpga/altera-pr-ip-core-plat.c | 10 ---------- > drivers/fpga/altera-pr-ip-core.c | 4 +--- > 2 files changed, 1 insertion(+), 13 deletions(-) > > diff --git a/drivers/fpga/altera-pr-ip-core-plat.c b/drivers/fpga/altera-pr-ip-core-plat.c > index 99b9cc0e70f0..b008a6b8d2d3 100644 > --- 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 2cf25fd5e897..5b130c4d9882 100644 > --- 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); >
diff --git a/drivers/fpga/altera-pr-ip-core-plat.c b/drivers/fpga/altera-pr-ip-core-plat.c index 99b9cc0e70f0..b008a6b8d2d3 100644 --- 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 2cf25fd5e897..5b130c4d9882 100644 --- 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);
Simplify registration using new devm_fpga_mgr_register() API. Signed-off-by: Moritz Fischer <mdf@kernel.org> --- Changes from v1: - Removed part that removes unused symbol --- drivers/fpga/altera-pr-ip-core-plat.c | 10 ---------- drivers/fpga/altera-pr-ip-core.c | 4 +--- 2 files changed, 1 insertion(+), 13 deletions(-)