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

Commit 47aff92c authored by Sachin Kamat's avatar Sachin Kamat Committed by Jonathan Cameron
Browse files

iio: light: hid-sensor-als: Use devm_iio_device_alloc 



Using devm_iio_device_alloc makes code simpler.

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Cc: Srinivas Pandruvada <srinivas.pandruvada@intel.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 452204ae

drivers/iio/light/hid-sensor-als.c

+5 −12
Original line number Diff line number Diff line
@@ -249,11 +249,9 @@ static int hid_als_probe(struct platform_device *pdev) 
	struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data;

	struct iio_chan_spec *channels;



	indio_dev = iio_device_alloc(sizeof(struct als_state));

	if (indio_dev == NULL) {

		ret = -ENOMEM;

		goto error_ret;

	}

	indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(struct als_state));

	if (!indio_dev)

		return -ENOMEM;

	platform_set_drvdata(pdev, indio_dev);



	als_state = iio_priv(indio_dev);
@@ -264,14 +262,13 @@ static int hid_als_probe(struct platform_device *pdev) 
					&als_state->common_attributes);

	if (ret) {

		dev_err(&pdev->dev, "failed to setup common attributes\n");

		goto error_free_dev;

		return ret;

	}



	channels = kmemdup(als_channels, sizeof(als_channels), GFP_KERNEL);

	if (!channels) {

		ret = -ENOMEM;

		dev_err(&pdev->dev, "failed to duplicate channels\n");

		goto error_free_dev;

		return -ENOMEM;

	}



	ret = als_parse_report(pdev, hsdev, channels,
@@ -329,9 +326,6 @@ static int hid_als_probe(struct platform_device *pdev) 
	iio_triggered_buffer_cleanup(indio_dev);

error_free_dev_mem:

	kfree(indio_dev->channels);

error_free_dev:

	iio_device_free(indio_dev);

error_ret:

	return ret;

}
@@ -346,7 +340,6 @@ static int hid_als_remove(struct platform_device *pdev) 
	hid_sensor_remove_trigger(indio_dev);

	iio_triggered_buffer_cleanup(indio_dev);

	kfree(indio_dev->channels);

	iio_device_free(indio_dev);



	return 0;

}