Merge tag 'iio-fixes-for-4.5a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...

[cascardo/linux.git] / drivers / iio / inkern.c

diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c
index 217e930..734a004 100644 (file)
--- a/drivers/iio/inkern.c
+++ b/drivers/iio/inkern.c
@@ -61,12 +61,10 @@ EXPORT_SYMBOL_GPL(iio_map_array_register);
 int iio_map_array_unregister(struct iio_dev *indio_dev)
 {
        int ret = -ENODEV;
-       struct iio_map_internal *mapi;
-       struct list_head *pos, *tmp;
+       struct iio_map_internal *mapi, *next;
 
        mutex_lock(&iio_map_list_lock);
-       list_for_each_safe(pos, tmp, &iio_map_list) {
-               mapi = list_entry(pos, struct iio_map_internal, l);
+       list_for_each_entry_safe(mapi, next, &iio_map_list, l) {
                if (indio_dev == mapi->indio_dev) {
                        list_del(&mapi->l);
                        kfree(mapi);