Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/connector: Remove usage of the deprecated ida_simple_xxx API

Use ida_alloc_xxx()/ida_free() instead of
ida_simple_get()/ida_simple_remove().
The latter is deprecated and more verbose.

Signed-off-by: Bo Liu <liubo03@inspur.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20220617082319.7599-1-liubo03@inspur.com
Link: https://patchwork.freedesktop.org/patch/msgid/20220621190055.8323-1-jiangjian@cdjrlc.com

authored by

Bo Liu and committed by
Daniel Vetter
e5d6eeea b00de0e2

+6 -7
+6 -7
drivers/gpu/drm/drm_connector.c
··· 251 251 connector->funcs = funcs; 252 252 253 253 /* connector index is used with 32bit bitmasks */ 254 - ret = ida_simple_get(&config->connector_ida, 0, 32, GFP_KERNEL); 254 + ret = ida_alloc_max(&config->connector_ida, 31, GFP_KERNEL); 255 255 if (ret < 0) { 256 256 DRM_DEBUG_KMS("Failed to allocate %s connector index: %d\n", 257 257 drm_connector_enum_list[connector_type].name, ··· 263 263 264 264 connector->connector_type = connector_type; 265 265 connector->connector_type_id = 266 - ida_simple_get(connector_ida, 1, 0, GFP_KERNEL); 266 + ida_alloc_min(connector_ida, 1, GFP_KERNEL); 267 267 if (connector->connector_type_id < 0) { 268 268 ret = connector->connector_type_id; 269 269 goto out_put_id; ··· 323 323 connector->debugfs_entry = NULL; 324 324 out_put_type_id: 325 325 if (ret) 326 - ida_simple_remove(connector_ida, connector->connector_type_id); 326 + ida_free(connector_ida, connector->connector_type_id); 327 327 out_put_id: 328 328 if (ret) 329 - ida_simple_remove(&config->connector_ida, connector->index); 329 + ida_free(&config->connector_ida, connector->index); 330 330 out_put: 331 331 if (ret) 332 332 drm_mode_object_unregister(dev, &connector->base); ··· 480 480 list_for_each_entry_safe(mode, t, &connector->modes, head) 481 481 drm_mode_remove(connector, mode); 482 482 483 - ida_simple_remove(&drm_connector_enum_list[connector->connector_type].ida, 483 + ida_free(&drm_connector_enum_list[connector->connector_type].ida, 484 484 connector->connector_type_id); 485 485 486 - ida_simple_remove(&dev->mode_config.connector_ida, 487 - connector->index); 486 + ida_free(&dev->mode_config.connector_ida, connector->index); 488 487 489 488 kfree(connector->display_info.bus_formats); 490 489 drm_mode_object_unregister(dev, &connector->base);