Skip to content

Commit

Permalink
iio:inkern: Use iio_device_{get,put}
Browse files Browse the repository at this point in the history
Use iio_device_get and iio_device_put instead of open-coding it.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Lars-Peter Clausen authored and Greg Kroah-Hartman committed Jun 5, 2012
1 parent e4e8b77 commit 1875ffd
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions drivers/iio/inkern.c
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ struct iio_channel *iio_st_channel_get(const char *name,
strcmp(channel_name, c_i->map->consumer_channel) != 0))
continue;
c = c_i;
get_device(&c->indio_dev->dev);
iio_device_get(c->indio_dev);
break;
}
mutex_unlock(&iio_map_list_lock);
Expand All @@ -149,7 +149,7 @@ EXPORT_SYMBOL_GPL(iio_st_channel_get);

void iio_st_channel_release(struct iio_channel *channel)
{
put_device(&channel->indio_dev->dev);
iio_device_put(channel->indio_dev);
kfree(channel);
}
EXPORT_SYMBOL_GPL(iio_st_channel_release);
Expand Down Expand Up @@ -195,10 +195,10 @@ struct iio_channel *iio_st_channel_get_all(const char *name)
c->map->adc_channel_label);
if (chans[mapind].channel == NULL) {
ret = -EINVAL;
put_device(&chans[mapind].indio_dev->dev);
iio_device_put(chans[mapind].indio_dev);
goto error_free_chans;
}
get_device(&chans[mapind].indio_dev->dev);
iio_device_get(chans[mapind].indio_dev);
mapind++;
}
mutex_unlock(&iio_map_list_lock);
Expand All @@ -210,8 +210,7 @@ struct iio_channel *iio_st_channel_get_all(const char *name)

error_free_chans:
for (i = 0; i < nummaps; i++)
if (chans[i].indio_dev)
put_device(&chans[i].indio_dev->dev);
iio_device_put(chans[i].indio_dev);
kfree(chans);
error_ret:
mutex_unlock(&iio_map_list_lock);
Expand All @@ -225,7 +224,7 @@ void iio_st_channel_release_all(struct iio_channel *channels)
struct iio_channel *chan = &channels[0];

while (chan->indio_dev) {
put_device(&chan->indio_dev->dev);
iio_device_put(chan->indio_dev);
chan++;
}
kfree(channels);
Expand Down

0 comments on commit 1875ffd

Please sign in to comment.