Merge tag 'for-5.4/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/devic...

[linux.git] / drivers / leds / leds-ti-lmu-common.c

diff --git a/drivers/leds/leds-ti-lmu-common.c b/drivers/leds/leds-ti-lmu-common.c
index adc7293004f1100b9bbfa0bc207948fe3c16c489..d7f10ad721badc62bd79c72c060deddf87d4a77b 100644 (file)
--- a/drivers/leds/leds-ti-lmu-common.c
+++ b/drivers/leds/leds-ti-lmu-common.c
@@ -11,10 +11,10 @@
 
 #include <linux/leds-ti-lmu-common.h>
 
-const static int ramp_table[16] = {2048, 262000, 524000, 1049000, 2090000,
-                               4194000, 8389000, 16780000, 33550000, 41940000,
-                               50330000, 58720000, 67110000, 83880000,
-                               100660000, 117440000};
+static const unsigned int ramp_table[16] = {2048, 262000, 524000, 1049000,
+                               2090000, 4194000, 8389000, 16780000, 33550000,
+                               41940000, 50330000, 58720000, 67110000,
+                               83880000, 100660000, 117440000};
 
 static int ti_lmu_common_update_brightness(struct ti_lmu_bank *lmu_bank,
                                           int brightness)
@@ -54,7 +54,7 @@ int ti_lmu_common_set_brightness(struct ti_lmu_bank *lmu_bank, int brightness)
 }
 EXPORT_SYMBOL(ti_lmu_common_set_brightness);
 
-static int ti_lmu_common_convert_ramp_to_index(unsigned int usec)
+static unsigned int ti_lmu_common_convert_ramp_to_index(unsigned int usec)
 {
        int size = ARRAY_SIZE(ramp_table);
        int i;
@@ -78,7 +78,7 @@ static int ti_lmu_common_convert_ramp_to_index(unsigned int usec)
                }
        }
 
-       return -EINVAL;
+       return 0;
 }
 
 int ti_lmu_common_set_ramp(struct ti_lmu_bank *lmu_bank)
@@ -94,9 +94,6 @@ int ti_lmu_common_set_ramp(struct ti_lmu_bank *lmu_bank)
                ramp_down = ti_lmu_common_convert_ramp_to_index(lmu_bank->ramp_down_usec);
        }
 
-       if (ramp_up < 0 || ramp_down < 0)
-               return -EINVAL;
-
        ramp = (ramp_up << 4) | ramp_down;
 
        return regmap_write(regmap, lmu_bank->runtime_ramp_reg, ramp);