Message ID | 20201115195127.284487-4-mdf@kernel.org (mailing list archive) |
---|---|
State | Queued, archived |
Headers | show |
Series | Introduce devm_fpga_mgr_register() | expand |
Tested on DFL FPGA platform, it is OK. Thanks, Yilun On Sun, Nov 15, 2020 at 11:51:20AM -0800, Moritz Fischer wrote: > Simplify registration using new devm_fpga_mgr_register() API. > > Reviewed-by: Tom Rix <trix@redhat.com> > Signed-off-by: Moritz Fischer <mdf@kernel.org> > --- > drivers/fpga/dfl-fme-mgr.c | 13 +------------ > 1 file changed, 1 insertion(+), 12 deletions(-) > > diff --git a/drivers/fpga/dfl-fme-mgr.c b/drivers/fpga/dfl-fme-mgr.c > index b3f7eee3c93f..d5861d13b306 100644 > --- a/drivers/fpga/dfl-fme-mgr.c > +++ b/drivers/fpga/dfl-fme-mgr.c > @@ -314,18 +314,8 @@ static int fme_mgr_probe(struct platform_device *pdev) > return -ENOMEM; > > mgr->compat_id = compat_id; > - platform_set_drvdata(pdev, mgr); > > - return fpga_mgr_register(mgr); > -} > - > -static int fme_mgr_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 struct platform_driver fme_mgr_driver = { > @@ -333,7 +323,6 @@ static struct platform_driver fme_mgr_driver = { > .name = DFL_FPGA_FME_MGR, > }, > .probe = fme_mgr_probe, > - .remove = fme_mgr_remove, > }; > > module_platform_driver(fme_mgr_driver); > -- > 2.29.2
diff --git a/drivers/fpga/dfl-fme-mgr.c b/drivers/fpga/dfl-fme-mgr.c index b3f7eee3c93f..d5861d13b306 100644 --- a/drivers/fpga/dfl-fme-mgr.c +++ b/drivers/fpga/dfl-fme-mgr.c @@ -314,18 +314,8 @@ static int fme_mgr_probe(struct platform_device *pdev) return -ENOMEM; mgr->compat_id = compat_id; - platform_set_drvdata(pdev, mgr); - return fpga_mgr_register(mgr); -} - -static int fme_mgr_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 struct platform_driver fme_mgr_driver = { @@ -333,7 +323,6 @@ static struct platform_driver fme_mgr_driver = { .name = DFL_FPGA_FME_MGR, }, .probe = fme_mgr_probe, - .remove = fme_mgr_remove, }; module_platform_driver(fme_mgr_driver);