Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5be5db24 authored by Himangi Saraogi's avatar Himangi Saraogi Committed by Jiri Kosina
Browse files

HID: hid-sensor-hub: use devm_ functions consistently 



Use devm_kzalloc for all calls to kzalloc and not just the first.  Use
devm functions for other allocations as well. The calls to free the
allocated memory in the probe and remove functions are done away with
and a label is removed in the probe function.

The semantic match that finds the inconsistency is as follows:

// <smpl>
@@
@@

*devm_kzalloc(...)
...
*kzalloc(...)
// </smpl>

Signed-off-by: default avatarHimangi Saraogi <himangi774@gmail.com>
Acked-by: default avatarJulia Lawall <julia.lawall@lip6.fr>
Reviewed-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@intel.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 6498d023

drivers/hid/hid-sensor-hub.c

+11 −22
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ static int sensor_hub_probe(struct hid_device *hdev, 
		ret = -EINVAL;

		goto err_stop_hw;

	}

	sd->hid_sensor_hub_client_devs = kzalloc(dev_cnt *

	sd->hid_sensor_hub_client_devs = devm_kzalloc(&hdev->dev, dev_cnt *

						      sizeof(struct mfd_cell),

						      GFP_KERNEL);

	if (sd->hid_sensor_hub_client_devs == NULL) {
@@ -618,11 +618,12 @@ static int sensor_hub_probe(struct hid_device *hdev, 


		if (collection->type == HID_COLLECTION_PHYSICAL) {



			hsdev = kzalloc(sizeof(*hsdev), GFP_KERNEL);

			hsdev = devm_kzalloc(&hdev->dev, sizeof(*hsdev),

					     GFP_KERNEL);

			if (!hsdev) {

				hid_err(hdev, "cannot allocate hid_sensor_hub_device\n");

				ret = -ENOMEM;

				goto err_no_mem;

				goto err_stop_hw;

			}

			hsdev->hdev = hdev;

			hsdev->vendor_id = hdev->vendor;
@@ -631,13 +632,13 @@ static int sensor_hub_probe(struct hid_device *hdev, 
			if (last_hsdev)

				last_hsdev->end_collection_index = i;

			last_hsdev = hsdev;

			name = kasprintf(GFP_KERNEL, "HID-SENSOR-%x",

			name = devm_kasprintf(&hdev->dev, GFP_KERNEL,

					      "HID-SENSOR-%x",

					      collection->usage);

			if (name == NULL) {

				hid_err(hdev, "Failed MFD device name\n");

					ret = -ENOMEM;

					kfree(hsdev);

					goto err_no_mem;

					goto err_stop_hw;

			}

			sd->hid_sensor_hub_client_devs[

				sd->hid_sensor_client_cnt].id =
@@ -661,16 +662,10 @@ static int sensor_hub_probe(struct hid_device *hdev, 
	ret = mfd_add_devices(&hdev->dev, 0, sd->hid_sensor_hub_client_devs,

		sd->hid_sensor_client_cnt, NULL, 0, NULL);

	if (ret < 0)

		goto err_no_mem;

		goto err_stop_hw;



	return ret;



err_no_mem:

	for (i = 0; i < sd->hid_sensor_client_cnt; ++i) {

		kfree(sd->hid_sensor_hub_client_devs[i].name);

		kfree(sd->hid_sensor_hub_client_devs[i].platform_data);

	}

	kfree(sd->hid_sensor_hub_client_devs);

err_stop_hw:

	hid_hw_stop(hdev);
@@ -681,7 +676,6 @@ static void sensor_hub_remove(struct hid_device *hdev) 
{

	struct sensor_hub_data *data = hid_get_drvdata(hdev);

	unsigned long flags;

	int i;



	hid_dbg(hdev, " hardware removed\n");

	hid_hw_close(hdev);
@@ -691,11 +685,6 @@ static void sensor_hub_remove(struct hid_device *hdev) 
		complete(&data->pending.ready);

	spin_unlock_irqrestore(&data->lock, flags);

	mfd_remove_devices(&hdev->dev);

	for (i = 0; i < data->hid_sensor_client_cnt; ++i) {

		kfree(data->hid_sensor_hub_client_devs[i].name);

		kfree(data->hid_sensor_hub_client_devs[i].platform_data);

	}

	kfree(data->hid_sensor_hub_client_devs);

	hid_set_drvdata(hdev, NULL);

	mutex_destroy(&data->mutex);

}