Srinivas Pandruvada <srinivas.pandruvada@xxxxxxxxxxxxxxx> wrote:
>On 08/02/2013 03:08 AM, Sachin Kamat wrote:
>> Using devm_iio_device_alloc makes code simpler.
>>
>> Signed-off-by: Sachin Kamat <sachin.kamat@xxxxxxxxxx>
>> Cc: Srinivas Pandruvada <srinivas.pandruvada@xxxxxxxxx>
>> ---
>> This series compile tested on togreg branch of
>> git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git
>> ---
>> drivers/iio/magnetometer/hid-sensor-magn-3d.c | 19
>+++++++------------
>> 1 file changed, 7 insertions(+), 12 deletions(-)
>>
>> diff --git a/drivers/iio/magnetometer/hid-sensor-magn-3d.c
>b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
>> index e71127a..5a6162d 100644
>> --- a/drivers/iio/magnetometer/hid-sensor-magn-3d.c
>> +++ b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
>> @@ -283,11 +283,11 @@ static int hid_magn_3d_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 magn_3d_state));
>> - if (indio_dev == NULL) {
>> - ret = -ENOMEM;
>> - goto error_ret;
>> - }
>> + indio_dev = devm_iio_device_alloc(&pdev->dev,
>> + sizeof(struct magn_3d_state));
>> + if (indio_dev == NULL)
>> + return -ENOMEM;
>> +
>> platform_set_drvdata(pdev, indio_dev);
>>
>> magn_state = iio_priv(indio_dev);
>> @@ -299,15 +299,14 @@ static int hid_magn_3d_probe(struct
>platform_device *pdev)
>> &magn_state->common_attributes);
>> if (ret) {
>?free indio_dev
>> dev_err(&pdev->dev, "failed to setup common attributes\n");
>> - goto error_free_dev;
>> + return ret;
>> }
>>
>> channels = kmemdup(magn_3d_channels, sizeof(magn_3d_channels),
>> GFP_KERNEL);
>> if (!channels) {
>> - ret = -ENOMEM;
>> dev_err(&pdev->dev, "failed to duplicate channels\n");
>> - goto error_free_dev;
>> + return -ENOMEM;
>> }
>>
>> ret = magn_3d_parse_report(pdev, hsdev, channels,
>
>Any calls fail after this need to free indio_dev?
No. Once allocated it will be freed when pdev->Dev is freed which will occur due to the error returned from this probe function.
This is as true here as it is in the remove function below.
>> @@ -364,9 +363,6 @@ error_unreg_buffer_funcs:
>> 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;
>> }
>>
>> @@ -381,7 +377,6 @@ static int hid_magn_3d_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;
>> }
--
Sent from my Android phone with K-9 Mail. Please excuse my brevity.
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
