include/linux/kernel.h: change abs() macro so it uses consistent return type

[firefly-linux-kernel-4.4.55.git] / drivers / iio / industrialio-core.c

diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index 7ede941e9301ac822bc2a68a894f7b63a292be52..131b434af994ddf5a09c3e828b33baba58ef66cd 100644 (file)
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -433,16 +433,15 @@ ssize_t iio_format_value(char *buf, unsigned int type, int size, int *vals)
                scale_db = true;
        case IIO_VAL_INT_PLUS_MICRO:
                if (vals[1] < 0)
-                       return sprintf(buf, "-%ld.%06u%s\n", abs(vals[0]),
-                                       -vals[1],
-                               scale_db ? " dB" : "");
+                       return sprintf(buf, "-%d.%06u%s\n", abs(vals[0]),
+                                      -vals[1], scale_db ? " dB" : "");
                else
                        return sprintf(buf, "%d.%06u%s\n", vals[0], vals[1],
                                scale_db ? " dB" : "");
        case IIO_VAL_INT_PLUS_NANO:
                if (vals[1] < 0)
-                       return sprintf(buf, "-%ld.%09u\n", abs(vals[0]),
-                                       -vals[1]);
+                       return sprintf(buf, "-%d.%09u\n", abs(vals[0]),
+                                      -vals[1]);
                else
                        return sprintf(buf, "%d.%09u\n", vals[0], vals[1]);
        case IIO_VAL_FRACTIONAL: