Le 16/06/2022 à 07:18, Bo Liu a écrit :

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

drivers/gpu/drm/drm_connector.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 1c48d162c77e..e3484b115ae6 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -250,7 +250,7 @@ int drm_connector_init(struct drm_device *dev, connector->funcs = funcs;

/* connector index is used with 32bit bitmasks */

• ret = ida_simple_get(&config->connector_ida, 0, 32, GFP_KERNEL);

• ret = ida_alloc_max(&config->connector_ida, 31, GFP_KERNEL); if (ret < 0) { DRM_DEBUG_KMS("Failed to allocate %s connector index: %d\n", drm_connector_enum_list[connector_type].name,

@@ -262,7 +262,7 @@ int drm_connector_init(struct drm_device *dev,

connector->connector_type = connector_type; connector->connector_type_id =

• ida_simple_get(connector_ida, 1, 0, GFP_KERNEL);
  

• ida_alloc_min(connector_ida, 1, GFP_KERNEL);
  

  if (connector->connector_type_id < 0) { ret = connector->connector_type_id; goto out_put_id;

@@ -322,10 +322,10 @@ int drm_connector_init(struct drm_device *dev, connector->debugfs_entry = NULL; out_put_type_id: if (ret)

• ida_simple_remove(connector_ida, connector->connector_type_id);
  

• ida_free(connector_ida, connector->connector_type_id);
  

  out_put_id: if (ret)

• ida_simple_remove(&config->connector_ida, connector->index);
  

• ida_free(&config->connector_ida, connector->index);
  

  out_put: if (ret) drm_mode_object_unregister(dev, &connector->base);

@@ -479,10 +479,10 @@ void drm_connector_cleanup(struct drm_connector *connector) list_for_each_entry_safe(mode, t, &connector->modes, head) drm_mode_remove(connector, mode);

• ida_simple_remove(&drm_connector_enum_list[connector->connector_type].ida,

• ida_free(&drm_connector_enum_list[connector->connector_type].ida, connector->connector_type_id);

Hi,

Nitpick: the code should be aligned with "&drm_connector_enum_list" now

• ida_simple_remove(&dev->mode_config.connector_ida,

• ida_free(&dev->mode_config.connector_ida, connector->index);

Same here, but I guess that it fits one one line now.

kfree(connector->display_info.bus_formats);