2024-01-14 09:57:23

by Christophe JAILLET

Subject: [PATCH] greybus: Remove usage of the deprecated ida_simple_xx() API

ida_alloc() and ida_free() should be preferred to the deprecated
ida_simple_get() and ida_simple_remove().

Note that the upper limit of ida_simple_get() is exclusive, but the one of
ida_alloc_range()/ida_alloc_max() is inclusive. So a -1 has been added when
needed.

Signed-off-by: Christophe JAILLET <[email protected]>
---
drivers/greybus/es2.c | 8 ++++----
drivers/greybus/hd.c | 16 ++++++++--------
drivers/greybus/interface.c | 9 ++++-----
3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/drivers/greybus/es2.c b/drivers/greybus/es2.c
index e89cca015095..1ee78d0d90b4 100644
--- a/drivers/greybus/es2.c
+++ b/drivers/greybus/es2.c
@@ -513,16 +513,16 @@ static int es2_cport_allocate(struct gb_host_device *hd, int cport_id,

if (cport_id < 0) {
ida_start = 0;
- ida_end = hd->num_cports;
+ ida_end = hd->num_cports - 1;
} else if (cport_id < hd->num_cports) {
ida_start = cport_id;
- ida_end = cport_id + 1;
+ ida_end = cport_id;
} else {
dev_err(&hd->dev, "cport %d not available\n", cport_id);
return -EINVAL;
}

- return ida_simple_get(id_map, ida_start, ida_end, GFP_KERNEL);
+ return ida_alloc_range(id_map, ida_start, ida_end, GFP_KERNEL);
}

static void es2_cport_release(struct gb_host_device *hd, u16 cport_id)
@@ -535,7 +535,7 @@ static void es2_cport_release(struct gb_host_device *hd, u16 cport_id)
return;
}

- ida_simple_remove(&hd->cport_id_map, cport_id);
+ ida_free(&hd->cport_id_map, cport_id);
}

static int cport_enable(struct gb_host_device *hd, u16 cport_id,
diff --git a/drivers/greybus/hd.c b/drivers/greybus/hd.c
index 72b21bf2d7d3..bc5fd2f53d8b 100644
--- a/drivers/greybus/hd.c
+++ b/drivers/greybus/hd.c
@@ -50,7 +50,7 @@ int gb_hd_cport_reserve(struct gb_host_device *hd, u16 cport_id)
struct ida *id_map = &hd->cport_id_map;
int ret;

- ret = ida_simple_get(id_map, cport_id, cport_id + 1, GFP_KERNEL);
+ ret = ida_alloc_range(id_map, cport_id, cport_id, GFP_KERNEL);
if (ret < 0) {
dev_err(&hd->dev, "failed to reserve cport %u\n", cport_id);
return ret;
@@ -64,7 +64,7 @@ void gb_hd_cport_release_reserved(struct gb_host_device *hd, u16 cport_id)
{
struct ida *id_map = &hd->cport_id_map;

- ida_simple_remove(id_map, cport_id);
+ ida_free(id_map, cport_id);
}
EXPORT_SYMBOL_GPL(gb_hd_cport_release_reserved);

@@ -80,16 +80,16 @@ int gb_hd_cport_allocate(struct gb_host_device *hd, int cport_id,

if (cport_id < 0) {
ida_start = 0;
- ida_end = hd->num_cports;
+ ida_end = hd->num_cports - 1;
} else if (cport_id < hd->num_cports) {
ida_start = cport_id;
- ida_end = cport_id + 1;
+ ida_end = cport_id;
} else {
dev_err(&hd->dev, "cport %d not available\n", cport_id);
return -EINVAL;
}

- return ida_simple_get(id_map, ida_start, ida_end, GFP_KERNEL);
+ return ida_alloc_range(id_map, ida_start, ida_end, GFP_KERNEL);
}

/* Locking: Caller guarantees serialisation */
@@ -100,7 +100,7 @@ void gb_hd_cport_release(struct gb_host_device *hd, u16 cport_id)
return;
}

- ida_simple_remove(&hd->cport_id_map, cport_id);
+ ida_free(&hd->cport_id_map, cport_id);
}

static void gb_hd_release(struct device *dev)
@@ -111,7 +111,7 @@ static void gb_hd_release(struct device *dev)

if (hd->svc)
gb_svc_put(hd->svc);
- ida_simple_remove(&gb_hd_bus_id_map, hd->bus_id);
+ ida_free(&gb_hd_bus_id_map, hd->bus_id);
ida_destroy(&hd->cport_id_map);
kfree(hd);
}
@@ -162,7 +162,7 @@ struct gb_host_device *gb_hd_create(struct gb_hd_driver *driver,
if (!hd)
return ERR_PTR(-ENOMEM);

- ret = ida_simple_get(&gb_hd_bus_id_map, 1, 0, GFP_KERNEL);
+ ret = ida_alloc_min(&gb_hd_bus_id_map, 1, GFP_KERNEL);
if (ret < 0) {
kfree(hd);
return ERR_PTR(ret);
diff --git a/drivers/greybus/interface.c b/drivers/greybus/interface.c
index 9ec949a438ef..c3cfd62831ff 100644
--- a/drivers/greybus/interface.c
+++ b/drivers/greybus/interface.c
@@ -131,9 +131,8 @@ static int gb_interface_route_create(struct gb_interface *intf)
int ret;

/* Allocate an interface device id. */
- ret = ida_simple_get(&svc->device_id_map,
- GB_SVC_DEVICE_ID_MIN, GB_SVC_DEVICE_ID_MAX + 1,
- GFP_KERNEL);
+ ret = ida_alloc_range(&svc->device_id_map, GB_SVC_DEVICE_ID_MIN,
+ GB_SVC_DEVICE_ID_MAX, GFP_KERNEL);
if (ret < 0) {
dev_err(&intf->dev, "failed to allocate device id: %d\n", ret);
return ret;
@@ -165,7 +164,7 @@ static int gb_interface_route_create(struct gb_interface *intf)
* XXX anymore.
*/
err_ida_remove:
- ida_simple_remove(&svc->device_id_map, device_id);
+ ida_free(&svc->device_id_map, device_id);

return ret;
}
@@ -178,7 +177,7 @@ static void gb_interface_route_destroy(struct gb_interface *intf)
return;

gb_svc_route_destroy(svc, svc->ap_intf_id, intf->interface_id);
- ida_simple_remove(&svc->device_id_map, intf->device_id);
+ ida_free(&svc->device_id_map, intf->device_id);
intf->device_id = GB_INTERFACE_DEVICE_ID_BAD;
}

--
2.43.0

2024-01-26 15:28:06

by Alex Elder

Subject: Re: [PATCH] greybus: Remove usage of the deprecated ida_simple_xx() API

On 1/14/24 3:57 AM, Christophe JAILLET wrote:
> ida_alloc() and ida_free() should be preferred to the deprecated
> ida_simple_get() and ida_simple_remove().
>
> Note that the upper limit of ida_simple_get() is exclusive, but the one of
> ida_alloc_range()/ida_alloc_max() is inclusive. So a -1 has been added when
> needed.

Looks good.

Reviewed-by: Alex Elder <[email protected]>

> Signed-off-by: Christophe JAILLET <[email protected]>
> ---
> drivers/greybus/es2.c | 8 ++++----
> drivers/greybus/hd.c | 16 ++++++++--------
> drivers/greybus/interface.c | 9 ++++-----
> 3 files changed, 16 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/greybus/es2.c b/drivers/greybus/es2.c
> index e89cca015095..1ee78d0d90b4 100644
> --- a/drivers/greybus/es2.c
> +++ b/drivers/greybus/es2.c
> @@ -513,16 +513,16 @@ static int es2_cport_allocate(struct gb_host_device *hd, int cport_id,
>
> if (cport_id < 0) {
> ida_start = 0;
> - ida_end = hd->num_cports;
> + ida_end = hd->num_cports - 1;
> } else if (cport_id < hd->num_cports) {
> ida_start = cport_id;
> - ida_end = cport_id + 1;
> + ida_end = cport_id;
> } else {
> dev_err(&hd->dev, "cport %d not available\n", cport_id);
> return -EINVAL;
> }
>
> - return ida_simple_get(id_map, ida_start, ida_end, GFP_KERNEL);
> + return ida_alloc_range(id_map, ida_start, ida_end, GFP_KERNEL);
> }
>
> static void es2_cport_release(struct gb_host_device *hd, u16 cport_id)
> @@ -535,7 +535,7 @@ static void es2_cport_release(struct gb_host_device *hd, u16 cport_id)
> return;
> }
>
> - ida_simple_remove(&hd->cport_id_map, cport_id);
> + ida_free(&hd->cport_id_map, cport_id);
> }
>
> static int cport_enable(struct gb_host_device *hd, u16 cport_id,
> diff --git a/drivers/greybus/hd.c b/drivers/greybus/hd.c
> index 72b21bf2d7d3..bc5fd2f53d8b 100644
> --- a/drivers/greybus/hd.c
> +++ b/drivers/greybus/hd.c
> @@ -50,7 +50,7 @@ int gb_hd_cport_reserve(struct gb_host_device *hd, u16 cport_id)
> struct ida *id_map = &hd->cport_id_map;
> int ret;
>
> - ret = ida_simple_get(id_map, cport_id, cport_id + 1, GFP_KERNEL);
> + ret = ida_alloc_range(id_map, cport_id, cport_id, GFP_KERNEL);
> if (ret < 0) {
> dev_err(&hd->dev, "failed to reserve cport %u\n", cport_id);
> return ret;
> @@ -64,7 +64,7 @@ void gb_hd_cport_release_reserved(struct gb_host_device *hd, u16 cport_id)
> {
> struct ida *id_map = &hd->cport_id_map;
>
> - ida_simple_remove(id_map, cport_id);
> + ida_free(id_map, cport_id);
> }
> EXPORT_SYMBOL_GPL(gb_hd_cport_release_reserved);
>
> @@ -80,16 +80,16 @@ int gb_hd_cport_allocate(struct gb_host_device *hd, int cport_id,
>
> if (cport_id < 0) {
> ida_start = 0;
> - ida_end = hd->num_cports;
> + ida_end = hd->num_cports - 1;
> } else if (cport_id < hd->num_cports) {
> ida_start = cport_id;
> - ida_end = cport_id + 1;
> + ida_end = cport_id;
> } else {
> dev_err(&hd->dev, "cport %d not available\n", cport_id);
> return -EINVAL;
> }
>
> - return ida_simple_get(id_map, ida_start, ida_end, GFP_KERNEL);
> + return ida_alloc_range(id_map, ida_start, ida_end, GFP_KERNEL);
> }
>
> /* Locking: Caller guarantees serialisation */
> @@ -100,7 +100,7 @@ void gb_hd_cport_release(struct gb_host_device *hd, u16 cport_id)
> return;
> }
>
> - ida_simple_remove(&hd->cport_id_map, cport_id);
> + ida_free(&hd->cport_id_map, cport_id);
> }
>
> static void gb_hd_release(struct device *dev)
> @@ -111,7 +111,7 @@ static void gb_hd_release(struct device *dev)
>
> if (hd->svc)
> gb_svc_put(hd->svc);
> - ida_simple_remove(&gb_hd_bus_id_map, hd->bus_id);
> + ida_free(&gb_hd_bus_id_map, hd->bus_id);
> ida_destroy(&hd->cport_id_map);
> kfree(hd);
> }
> @@ -162,7 +162,7 @@ struct gb_host_device *gb_hd_create(struct gb_hd_driver *driver,
> if (!hd)
> return ERR_PTR(-ENOMEM);
>
> - ret = ida_simple_get(&gb_hd_bus_id_map, 1, 0, GFP_KERNEL);
> + ret = ida_alloc_min(&gb_hd_bus_id_map, 1, GFP_KERNEL);
> if (ret < 0) {
> kfree(hd);
> return ERR_PTR(ret);
> diff --git a/drivers/greybus/interface.c b/drivers/greybus/interface.c
> index 9ec949a438ef..c3cfd62831ff 100644
> --- a/drivers/greybus/interface.c
> +++ b/drivers/greybus/interface.c
> @@ -131,9 +131,8 @@ static int gb_interface_route_create(struct gb_interface *intf)
> int ret;
>
> /* Allocate an interface device id. */
> - ret = ida_simple_get(&svc->device_id_map,
> - GB_SVC_DEVICE_ID_MIN, GB_SVC_DEVICE_ID_MAX + 1,
> - GFP_KERNEL);
> + ret = ida_alloc_range(&svc->device_id_map, GB_SVC_DEVICE_ID_MIN,
> + GB_SVC_DEVICE_ID_MAX, GFP_KERNEL);
> if (ret < 0) {
> dev_err(&intf->dev, "failed to allocate device id: %d\n", ret);
> return ret;
> @@ -165,7 +164,7 @@ static int gb_interface_route_create(struct gb_interface *intf)
> * XXX anymore.
> */
> err_ida_remove:
> - ida_simple_remove(&svc->device_id_map, device_id);
> + ida_free(&svc->device_id_map, device_id);
>
> return ret;
> }
> @@ -178,7 +177,7 @@ static void gb_interface_route_destroy(struct gb_interface *intf)
> return;
>
> gb_svc_route_destroy(svc, svc->ap_intf_id, intf->interface_id);
> - ida_simple_remove(&svc->device_id_map, intf->device_id);
> + ida_free(&svc->device_id_map, intf->device_id);
> intf->device_id = GB_INTERFACE_DEVICE_ID_BAD;
> }
>