Commit 5500382e authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman
Browse files

staging: 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, buInputt the one of
ida_alloc_range()/ida_alloc_max() is inclusive. So a -1 has been added when
needed.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/2e7bbdaf8a495bb1273396395b5c779363287581.1705350141.git.christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5b5ea312

drivers/staging/greybus/audio_manager.c

+4 −4
Original line number Diff line number Diff line
@@ -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

+3 −3
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ int gb_cap_connection_init(struct gb_connection *connection) 
	if (ret)

		goto err_list_del;



	minor = ida_simple_get(&cap_minors_map, 0, NUM_MINORS, GFP_KERNEL);

	minor = ida_alloc_max(&cap_minors_map, NUM_MINORS - 1, GFP_KERNEL);

	if (minor < 0) {

		ret = minor;

		goto err_connection_disable;
@@ -351,7 +351,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:
@@ -375,7 +375,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

+3 −4
Original line number Diff line number Diff line
@@ -63,8 +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,

				  fw_req->firmware_id);

		ida_free(&fw_req->fw_download->id_map, fw_req->firmware_id);



	kfree(fw_req);

}
@@ -171,7 +170,7 @@ static struct fw_request *find_firmware(struct fw_download *fw_download, 
		return ERR_PTR(-ENOMEM);



	/* Allocate ids from 1 to 255 (u8-max), 0 is an invalid id */

	ret = ida_simple_get(&fw_download->id_map, 1, 256, GFP_KERNEL);

	ret = ida_alloc_range(&fw_download->id_map, 1, 255, GFP_KERNEL);

	if (ret < 0) {

		dev_err(fw_download->parent,

			"failed to allocate firmware id (%d)\n", ret);
@@ -212,7 +211,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

+9 −11
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static int fw_mgmt_load_and_validate_operation(struct fw_mgmt *fw_mgmt, 
	}



	/* Allocate ids from 1 to 255 (u8-max), 0 is an invalid id */

	ret = ida_simple_get(&fw_mgmt->id_map, 1, 256, GFP_KERNEL);

	ret = ida_alloc_range(&fw_mgmt->id_map, 1, 255, GFP_KERNEL);

	if (ret < 0) {

		dev_err(fw_mgmt->parent, "failed to allocate request id (%d)\n",

			ret);
@@ -180,8 +180,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,

				  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;

		dev_err(fw_mgmt->parent,

			"load and validate firmware request failed (%d)\n",
@@ -220,7 +219,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);
@@ -316,7 +315,7 @@ static int fw_mgmt_backend_fw_update_operation(struct fw_mgmt *fw_mgmt, 
	}



	/* Allocate ids from 1 to 255 (u8-max), 0 is an invalid id */

	ret = ida_simple_get(&fw_mgmt->id_map, 1, 256, GFP_KERNEL);

	ret = ida_alloc_range(&fw_mgmt->id_map, 1, 255, GFP_KERNEL);

	if (ret < 0) {

		dev_err(fw_mgmt->parent, "failed to allocate request id (%d)\n",

			ret);
@@ -330,8 +329,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,

				  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;

		dev_err(fw_mgmt->parent,

			"backend %s firmware update request failed (%d)\n", tag,
@@ -369,7 +367,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;
@@ -617,7 +615,7 @@ int gb_fw_mgmt_connection_init(struct gb_connection *connection) 
	if (ret)

		goto err_list_del;



	minor = ida_simple_get(&fw_mgmt_minors_map, 0, NUM_MINORS, GFP_KERNEL);

	minor = ida_alloc_max(&fw_mgmt_minors_map, NUM_MINORS - 1, GFP_KERNEL);

	if (minor < 0) {

		ret = minor;

		goto err_connection_disable;
@@ -645,7 +643,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:
@@ -669,7 +667,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

+3 −3
Original line number Diff line number Diff line
@@ -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);

}
@@ -225,13 +225,13 @@ static struct gbphy_device *gb_gbphy_create_dev(struct gb_bundle *bundle, 
	int retval;

	int id;



	id = ida_simple_get(&gbphy_id, 1, 0, GFP_KERNEL);

	id = ida_alloc_min(&gbphy_id, 1, GFP_KERNEL);

	if (id < 0)

		return ERR_PTR(id);



	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);

	}