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 <christophe.jaillet@wanadoo.fr> Reviewed-by: Alex Elder <elder@linaro.org> Link: https://lore.kernel.org/r/26425379d3eb9ba1b9af44468576ee20c77eb248.1705226208.git.christophe.jaillet@wanadoo.fr Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
664c89c56e
commit
3bd291383c
@@ -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 @@ err_svc_id_free:
|
||||
* 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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user