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

[platform/kernel/linux-rpi.git] / drivers / iio / industrialio-core.c

diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index a46cdf2..65ff0d0 100644 (file)
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -161,6 +161,7 @@ static const char * const iio_chan_info_postfix[] = {
        [IIO_CHAN_INFO_DEBOUNCE_TIME] = "debounce_time",
        [IIO_CHAN_INFO_CALIBEMISSIVITY] = "calibemissivity",
        [IIO_CHAN_INFO_OVERSAMPLING_RATIO] = "oversampling_ratio",
+       [IIO_CHAN_INFO_THERMOCOUPLE_TYPE] = "thermocouple_type",
 };
 
 /**
@@ -596,6 +597,8 @@ static ssize_t __iio_format_value(char *buf, size_t len, unsigned int type,
                }
                return l;
        }
+       case IIO_VAL_CHAR:
+               return snprintf(buf, len, "%c", (char)vals[0]);
        default:
                return 0;
        }
@@ -837,7 +840,8 @@ static ssize_t iio_write_channel_info(struct device *dev,
        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
        int ret, fract_mult = 100000;
-       int integer, fract;
+       int integer, fract = 0;
+       bool is_char = false;
 
        /* Assumes decimal - precision based on number of digits */
        if (!indio_dev->info->write_raw)
@@ -855,13 +859,24 @@ static ssize_t iio_write_channel_info(struct device *dev,
                case IIO_VAL_INT_PLUS_NANO:
                        fract_mult = 100000000;
                        break;
+               case IIO_VAL_CHAR:
+                       is_char = true;
+                       break;
                default:
                        return -EINVAL;
                }
 
-       ret = iio_str_to_fixpoint(buf, fract_mult, &integer, &fract);
-       if (ret)
-               return ret;
+       if (is_char) {
+               char ch;
+
+               if (sscanf(buf, "%c", &ch) != 1)
+                       return -EINVAL;
+               integer = ch;
+       } else {
+               ret = iio_str_to_fixpoint(buf, fract_mult, &integer, &fract);
+               if (ret)
+                       return ret;
+       }
 
        ret = indio_dev->info->write_raw(indio_dev, this_attr->c,
                                         integer, fract, this_attr->address);
@@ -1617,7 +1632,7 @@ static long iio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 }
 
 static const struct file_operations iio_buffer_fileops = {
-       .read = iio_buffer_read_first_n_outer_addr,
+       .read = iio_buffer_read_outer_addr,
        .release = iio_chrdev_release,
        .open = iio_chrdev_open,
        .poll = iio_buffer_poll_addr,