staging: greybus: Directly use ida_alloc()/free()
Subsystems (5)
Staging Greybus Greybus audio protocols drivers Greybus FW/HID/SPI protocols drivers +1 more subsystems
PATCH 1/1 staging: greybus: Directly use ida_alloc()/free()
Use ida_alloc()/ida_free() instead of deprecated
ida_simple_get()/ida_simple_remove() .
Signed-off-by keliu <[email protected]>
--- drivers/staging/greybus/audio_manager.c | 8 ++++---- drivers/staging/greybus/authentication.c | 4 ++-- drivers/staging/greybus/fw-download.c | 4 ++-- drivers/staging/greybus/fw-management.c | 12 ++++++------ drivers/staging/greybus/gbphy.c | 4 ++-- drivers/staging/greybus/loopback.c | 6 +++--- drivers/staging/greybus/raw.c | 6 +++--- drivers/staging/greybus/vibrator.c | 6 +++--- 8 files changed, 25 insertions(+), 25 deletions(-)
drivers/staging/greybus/audio_manager.c +4 -4
@@ -44,14 +44,14 @@ int gb_audio_manager_add(struct gb_audio_manager_module_descriptor *desc)int id;int err; - id =ida_simple_get (&module_id,0 ,0 ,GFP_KERNEL ); + id =ida_alloc (&module_id,GFP_KERNEL );if (id <0 )return id; err =gb_audio_manager_module_create (&module, manager_kset, id, desc);if (err) { -ida_simple_remove (&module_id, id); +ida_free (&module_id, id);return err; }
@@ -78,7 +78,7 @@ int gb_audio_manager_remove(int id)list_del (&module->list);kobject_put (&module->kobj);up_write (&modules_rwsem); -ida_simple_remove (&module_id, id); +ida_free (&module_id, id);return 0 ; }EXPORT_SYMBOL_GPL (gb_audio_manager_remove);
@@ -92,7 +92,7 @@ void gb_audio_manager_remove_all(void)list_for_each_entry_safe (module, next, &modules_list, list) {list_del (&module->list); -ida_simple_remove (&module_id, module->id); +ida_free (&module_id, module->id);kobject_put (&module->kobj); }
drivers/staging/greybus/authentication.c +2 -2
@@ -348,7 +348,7 @@ int gb_cap_connection_init(struct gb_connection *connection) err_del_cdev:cdev_del (&cap->cdev); err_remove_ida: -ida_simple_remove (&cap_minors_map, minor); +ida_free (&cap_minors_map, minor); err_connection_disable:gb_connection_disable (connection); err_list_del:
@@ -372,7 +372,7 @@ void gb_cap_connection_exit(struct gb_connection *connection)device_destroy (cap_class, cap->dev_num);cdev_del (&cap->cdev); -ida_simple_remove (&cap_minors_map,MINOR (cap->dev_num)); +ida_free (&cap_minors_map,MINOR (cap->dev_num));/* * Disallow any new ioctl operations on the char device and wait for
drivers/staging/greybus/fw-download.c +2 -2
@@ -63,7 +63,7 @@ static void fw_req_release(struct kref *kref)* just hope that it never happens. */ if (!fw_req->timedout) -ida_simple_remove (&fw_req->fw_download->id_map, +ida_free (&fw_req->fw_download->id_map, fw_req->firmware_id);kfree (fw_req);
@@ -212,7 +212,7 @@ static struct fw_request *find_firmware(struct fw_download *fw_download,return fw_req; err_free_id: -ida_simple_remove (&fw_download->id_map, fw_req->firmware_id); +ida_free (&fw_download->id_map, fw_req->firmware_id); err_free_req:kfree (fw_req);
drivers/staging/greybus/fw-management.c +6 -6
@@ -177,7 +177,7 @@ static int fw_mgmt_load_and_validate_operation(struct fw_mgmt *fw_mgmt,GB_FW_MGMT_TYPE_LOAD_AND_VALIDATE_FW , &request, sizeof(request), NULL, 0);if (ret) { -ida_simple_remove (&fw_mgmt->id_map, +ida_free (&fw_mgmt->id_map, fw_mgmt->intf_fw_request_id); fw_mgmt->intf_fw_request_id =0 ; dev_err(fw_mgmt->parent,
@@ -217,7 +217,7 @@ static int fw_mgmt_interface_fw_loaded_operation(struct gb_operation *op)return -ENODEV ; } -ida_simple_remove (&fw_mgmt->id_map, fw_mgmt->intf_fw_request_id); +ida_free (&fw_mgmt->id_map, fw_mgmt->intf_fw_request_id); fw_mgmt->intf_fw_request_id =0 ; fw_mgmt->intf_fw_status = request->status; fw_mgmt->intf_fw_major =le16_to_cpu (request->major);
@@ -327,7 +327,7 @@ static int fw_mgmt_backend_fw_update_operation(struct fw_mgmt *fw_mgmt,GB_FW_MGMT_TYPE_BACKEND_FW_UPDATE , &request, sizeof(request), NULL, 0);if (ret) { -ida_simple_remove (&fw_mgmt->id_map, +ida_free (&fw_mgmt->id_map, fw_mgmt->backend_fw_request_id); fw_mgmt->backend_fw_request_id =0 ; dev_err(fw_mgmt->parent,
@@ -366,7 +366,7 @@ static int fw_mgmt_backend_fw_updated_operation(struct gb_operation *op)return -ENODEV ; } -ida_simple_remove (&fw_mgmt->id_map, fw_mgmt->backend_fw_request_id); +ida_free (&fw_mgmt->id_map, fw_mgmt->backend_fw_request_id); fw_mgmt->backend_fw_request_id =0 ; fw_mgmt->backend_fw_status = request->status;
@@ -642,7 +642,7 @@ int gb_fw_mgmt_connection_init(struct gb_connection *connection) err_del_cdev:cdev_del (&fw_mgmt->cdev); err_remove_ida: -ida_simple_remove (&fw_mgmt_minors_map, minor); +ida_free (&fw_mgmt_minors_map, minor); err_connection_disable:gb_connection_disable (connection); err_list_del:
@@ -666,7 +666,7 @@ void gb_fw_mgmt_connection_exit(struct gb_connection *connection)device_destroy (fw_mgmt_class, fw_mgmt->dev_num);cdev_del (&fw_mgmt->cdev); -ida_simple_remove (&fw_mgmt_minors_map,MINOR (fw_mgmt->dev_num)); +ida_free (&fw_mgmt_minors_map,MINOR (fw_mgmt->dev_num));/* * Disallow any new ioctl operations on the char device and wait for
drivers/staging/greybus/gbphy.c +2 -2
@@ -46,7 +46,7 @@ static void gbphy_dev_release(struct device *dev) {struct gbphy_device *gbphy_dev =to_gbphy_dev (dev); -ida_simple_remove (&gbphy_id, gbphy_dev->id); +ida_free (&gbphy_id, gbphy_dev->id);kfree (gbphy_dev); }
@@ -231,7 +231,7 @@ static struct gbphy_device *gb_gbphy_create_dev(struct gb_bundle *bundle, gbphy_dev =kzalloc (sizeof (*gbphy_dev),GFP_KERNEL );if (!gbphy_dev) { -ida_simple_remove (&gbphy_id, id); +ida_free (&gbphy_id, id);return ERR_PTR (-ENOMEM ); }
drivers/staging/greybus/loopback.c +3 -3
@@ -1029,7 +1029,7 @@ static int gb_loopback_probe(struct gb_bundle *bundle, gb->file =debugfs_create_file (name,S_IFREG |0444 , gb_dev.root, gb, &gb_loopback_dbgfs_latency_fops); - gb->id =ida_simple_get (&loopback_ida,0 ,0 ,GFP_KERNEL ); + gb->id =ida_alloc (&loopback_ida,GFP_KERNEL );if (gb->id <0 ) { retval = gb->id; goto out_debugfs_remove;
@@ -1080,7 +1080,7 @@ static int gb_loopback_probe(struct gb_bundle *bundle, out_connection_disable:gb_connection_disable (connection); out_ida_remove: -ida_simple_remove (&loopback_ida, gb->id); +ida_free (&loopback_ida, gb->id); out_debugfs_remove:debugfs_remove (gb->file); out_connection_destroy:
@@ -1122,7 +1122,7 @@ static void gb_loopback_disconnect(struct gb_bundle *bundle)spin_unlock_irqrestore (&gb_dev.lock, flags);device_unregister (gb->dev); -ida_simple_remove (&loopback_ida, gb->id); +ida_free (&loopback_ida, gb->id);gb_connection_destroy (gb->connection);kfree (gb);
drivers/staging/greybus/raw.c +3 -3
@@ -178,7 +178,7 @@ static int gb_raw_probe(struct gb_bundle *bundle, raw->connection = connection;greybus_set_drvdata (bundle, raw); - minor =ida_simple_get (&minors,0 ,0 ,GFP_KERNEL ); + minor =ida_alloc (&minors,GFP_KERNEL );if (minor <0 ) { retval = minor; goto error_connection_destroy;
@@ -211,7 +211,7 @@ static int gb_raw_probe(struct gb_bundle *bundle,gb_connection_disable (connection); error_remove_ida: -ida_simple_remove (&minors, minor); +ida_free (&minors, minor); error_connection_destroy:gb_connection_destroy (connection);
@@ -232,7 +232,7 @@ static void gb_raw_disconnect(struct gb_bundle *bundle)device_destroy (raw_class, raw->dev);cdev_del (&raw->cdev);gb_connection_disable (connection); -ida_simple_remove (&minors,MINOR (raw->dev)); +ida_free (&minors,MINOR (raw->dev));gb_connection_destroy (connection);mutex_lock (&raw->list_lock);
drivers/staging/greybus/vibrator.c +3 -3
@@ -154,7 +154,7 @@ static int gb_vibrator_probe(struct gb_bundle *bundle,* there is a "real" device somewhere in the kernel for this, but I * can't find it at the moment... */ - vib->minor =ida_simple_get (&minors,0 ,0 ,GFP_KERNEL ); + vib->minor =ida_alloc (&minors,GFP_KERNEL );if (vib->minor <0 ) { retval = vib->minor; goto err_connection_disable;
@@ -174,7 +174,7 @@ static int gb_vibrator_probe(struct gb_bundle *bundle,return 0 ; err_ida_remove: -ida_simple_remove (&minors, vib->minor); +ida_free (&minors, vib->minor); err_connection_disable:gb_connection_disable (connection); err_connection_destroy:
@@ -198,7 +198,7 @@ static void gb_vibrator_disconnect(struct gb_bundle *bundle)turn_off (vib);device_unregister (vib->dev); -ida_simple_remove (&minors, vib->minor); +ida_free (&minors, vib->minor);gb_connection_disable (vib->connection);gb_connection_destroy (vib->connection);kfree (vib);
Signature · 1 line
2.25.1
Johan Hovold
maintainerQuoted 4 lines · keliu
Use ida_alloc()/ida_free() instead of deprecated
ida_simple_get()/ida_simple_remove() .Signed-off-by keliu <[email protected]>
Is "keliu" really your full legal name?
Quoted 25 lines
--- drivers/staging/greybus/audio_manager.c | 8 ++++---- drivers/staging/greybus/authentication.c | 4 ++-- drivers/staging/greybus/fw-download.c | 4 ++-- drivers/staging/greybus/fw-management.c | 12 ++++++------ drivers/staging/greybus/gbphy.c | 4 ++-- drivers/staging/greybus/loopback.c | 6 +++--- drivers/staging/greybus/raw.c | 6 +++--- drivers/staging/greybus/vibrator.c | 6 +++--- 8 files changed, 25 insertions(+), 25 deletions(-)drivers/staging/greybus/authentication.c +1
-1@@ -348,7 +348,7 @@ int gb_cap_connection_init(struct gb_connection *connection) err_del_cdev:cdev_del (&cap->cdev); err_remove_ida: -ida_simple_remove (&cap_minors_map, minor); +ida_free (&cap_minors_map, minor); err_connection_disable:gb_connection_disable (connection); err_list_del:
drivers/staging/greybus/authentication.c void gb_cap_connection_exit(struct gb_connection *connection) · line 378
Quoted 8 lines
drivers/staging/greybus/authentication.c +1
-1@@ -372,7 +372,7 @@ void gb_cap_connection_exit(struct gb_connection *connection)device_destroy (cap_class, cap->dev_num);cdev_del (&cap->cdev); -ida_simple_remove (&cap_minors_map,MINOR (cap->dev_num)); +ida_free (&cap_minors_map,MINOR (cap->dev_num));/* * Disallow any new ioctl operations on the char device and wait for
The above looks incomplete since you do not change the ida_simple_get() in gb_cap_connection_init().
Please check for any similar mistakes throughout.
Johan