drm/i915: Always load the display palette before enabling the pipe

[~andy/linux] / drivers / iio / industrialio-core.c

diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index f05289f7b512ccc0c12c62c8d7142cb57fc14ce2..e145931ef1b82906478c5a32505cada2d8eb1547 100644 (file)
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -691,23 +691,6 @@ static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev,
 
        if (chan->channel < 0)
                return 0;
-       for_each_set_bit(i, &chan->info_mask, sizeof(long)*8) {
-               ret = __iio_add_chan_devattr(iio_chan_info_postfix[i/2],
-                                            chan,
-                                            &iio_read_channel_info,
-                                            &iio_write_channel_info,
-                                            i/2,
-                                            !(i%2),
-                                            &indio_dev->dev,
-                                            &indio_dev->channel_attr_list);
-               if (ret == -EBUSY && (i%2 == 0)) {
-                       ret = 0;
-                       continue;
-               }
-               if (ret < 0)
-                       goto error_ret;
-               attrcount++;
-       }
        for_each_set_bit(i, &chan->info_mask_separate, sizeof(long)*8) {
                ret = __iio_add_chan_devattr(iio_chan_info_postfix[i],
                                             chan,