lkml.org 
[lkml]   [2022]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] fpga: Directly use ida_alloc()/free()
On Sat, May 28, 2022 at 11:43:55PM +0800, Xu Yilun wrote:
> On Fri, May 27, 2022 at 08:59:15AM +0000, keliu wrote:
> > Use ida_alloc()/ida_free() instead of deprecated
> > ida_simple_get()/ida_simple_remove() .
> >
> > Signed-off-by: keliu <liuke94@huawei.com>
>
> Acked-by: Xu Yilun <yilun.xu@intel.com>

Applied to for-next.

Thanks,
Yilun

>
> > ---
> > drivers/fpga/dfl.c | 4 ++--
> > drivers/fpga/fpga-bridge.c | 6 +++---
> > drivers/fpga/fpga-mgr.c | 6 +++---
> > drivers/fpga/fpga-region.c | 6 +++---
> > 4 files changed, 11 insertions(+), 11 deletions(-)
> >
> > diff --git a/drivers/fpga/dfl.c b/drivers/fpga/dfl.c
> > index 599bb21d86af..2dff0c626cc6 100644
> > --- a/drivers/fpga/dfl.c
> > +++ b/drivers/fpga/dfl.c
> > @@ -342,7 +342,7 @@ static void release_dfl_dev(struct device *dev)
> > if (ddev->mmio_res.parent)
> > release_resource(&ddev->mmio_res);
> >
> > - ida_simple_remove(&dfl_device_ida, ddev->id);
> > + ida_free(&dfl_device_ida, ddev->id);
> > kfree(ddev->irqs);
> > kfree(ddev);
> > }
> > @@ -360,7 +360,7 @@ dfl_dev_add(struct dfl_feature_platform_data *pdata,
> > if (!ddev)
> > return ERR_PTR(-ENOMEM);
> >
> > - id = ida_simple_get(&dfl_device_ida, 0, 0, GFP_KERNEL);
> > + id = ida_alloc(&dfl_device_ida, GFP_KERNEL);
> > if (id < 0) {
> > dev_err(&pdev->dev, "unable to get id\n");
> > kfree(ddev);
> > diff --git a/drivers/fpga/fpga-bridge.c b/drivers/fpga/fpga-bridge.c
> > index 16f2b164a178..727704431f61 100644
> > --- a/drivers/fpga/fpga-bridge.c
> > +++ b/drivers/fpga/fpga-bridge.c
> > @@ -342,7 +342,7 @@ fpga_bridge_register(struct device *parent, const char *name,
> > if (!bridge)
> > return ERR_PTR(-ENOMEM);
> >
> > - id = ida_simple_get(&fpga_bridge_ida, 0, 0, GFP_KERNEL);
> > + id = ida_alloc(&fpga_bridge_ida, GFP_KERNEL);
> > if (id < 0) {
> > ret = id;
> > goto error_kfree;
> > @@ -375,7 +375,7 @@ fpga_bridge_register(struct device *parent, const char *name,
> > return bridge;
> >
> > error_device:
> > - ida_simple_remove(&fpga_bridge_ida, id);
> > + ida_free(&fpga_bridge_ida, id);
> > error_kfree:
> > kfree(bridge);
> >
> > @@ -407,7 +407,7 @@ static void fpga_bridge_dev_release(struct device *dev)
> > {
> > struct fpga_bridge *bridge = to_fpga_bridge(dev);
> >
> > - ida_simple_remove(&fpga_bridge_ida, bridge->dev.id);
> > + ida_free(&fpga_bridge_ida, bridge->dev.id);
> > kfree(bridge);
> > }
> >
> > diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c
> > index d49a9ce34568..2955a21beebe 100644
> > --- a/drivers/fpga/fpga-mgr.c
> > +++ b/drivers/fpga/fpga-mgr.c
> > @@ -622,7 +622,7 @@ fpga_mgr_register_full(struct device *parent, const struct fpga_manager_info *in
> > if (!mgr)
> > return ERR_PTR(-ENOMEM);
> >
> > - id = ida_simple_get(&fpga_mgr_ida, 0, 0, GFP_KERNEL);
> > + id = ida_alloc(&fpga_mgr_ida, GFP_KERNEL);
> > if (id < 0) {
> > ret = id;
> > goto error_kfree;
> > @@ -661,7 +661,7 @@ fpga_mgr_register_full(struct device *parent, const struct fpga_manager_info *in
> > return mgr;
> >
> > error_device:
> > - ida_simple_remove(&fpga_mgr_ida, id);
> > + ida_free(&fpga_mgr_ida, id);
> > error_kfree:
> > kfree(mgr);
> >
> > @@ -785,7 +785,7 @@ static void fpga_mgr_dev_release(struct device *dev)
> > {
> > struct fpga_manager *mgr = to_fpga_manager(dev);
> >
> > - ida_simple_remove(&fpga_mgr_ida, mgr->dev.id);
> > + ida_free(&fpga_mgr_ida, mgr->dev.id);
> > kfree(mgr);
> > }
> >
> > diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c
> > index b0ac18de4885..18bcaa1926dd 100644
> > --- a/drivers/fpga/fpga-region.c
> > +++ b/drivers/fpga/fpga-region.c
> > @@ -202,7 +202,7 @@ fpga_region_register_full(struct device *parent, const struct fpga_region_info *
> > if (!region)
> > return ERR_PTR(-ENOMEM);
> >
> > - id = ida_simple_get(&fpga_region_ida, 0, 0, GFP_KERNEL);
> > + id = ida_alloc(&fpga_region_ida, GFP_KERNEL);
> > if (id < 0) {
> > ret = id;
> > goto err_free;
> > @@ -234,7 +234,7 @@ fpga_region_register_full(struct device *parent, const struct fpga_region_info *
> > return region;
> >
> > err_remove:
> > - ida_simple_remove(&fpga_region_ida, id);
> > + ida_free(&fpga_region_ida, id);
> > err_free:
> > kfree(region);
> >
> > @@ -283,7 +283,7 @@ static void fpga_region_dev_release(struct device *dev)
> > {
> > struct fpga_region *region = to_fpga_region(dev);
> >
> > - ida_simple_remove(&fpga_region_ida, region->dev.id);
> > + ida_free(&fpga_region_ida, region->dev.id);
> > kfree(region);
> > }
> >
> > --
> > 2.25.1

\
 
 \ /
  Last update: 2022-06-08 08:55    [W:0.058 / U:0.780 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site