diff options
| author | Marijn Suijten <marijn.suijten@somainline.org> | 2021-11-15 23:34:55 +0300 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2021-12-22 14:17:13 +0300 |
| commit | 2b4b49602f9feca7b7a84eaa33ad9e666c8aa695 (patch) | |
| tree | f2e4fbe5046ecbae1a8f5b0b1a78a9c45779e532 /drivers/video | |
| parent | 5ada78b26f935f8751852dffa24f6b545b1d2517 (diff) | |
| download | linux-2b4b49602f9feca7b7a84eaa33ad9e666c8aa695.tar.xz | |
backlight: qcom-wled: Override default length with qcom,enabled-strings
The length of qcom,enabled-strings as property array is enough to
determine the number of strings to be enabled, without needing to set
qcom,num-strings to override the default number of strings when less
than the default (which is also the maximum) is provided in DT.
This also introduces an extra warning when qcom,num-strings is set,
denoting that it is not necessary to set both anymore. It is usually
more concise to set just qcom,num-length when a zero-based, contiguous
range of strings is needed (the majority of the cases), or to only set
qcom,enabled-strings when a specific set of indices is desired.
Fixes: 775d2ffb4af6 ("backlight: qcom-wled: Restructure the driver for WLED3")
Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@somainline.org>
Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20211115203459.1634079-6-marijn.suijten@somainline.org
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/backlight/qcom-wled.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/video/backlight/qcom-wled.c b/drivers/video/backlight/qcom-wled.c index ab10910971e9..5306b06044b4 100644 --- a/drivers/video/backlight/qcom-wled.c +++ b/drivers/video/backlight/qcom-wled.c @@ -1520,6 +1520,8 @@ static int wled_configure(struct wled *wled) return -EINVAL; } } + + cfg->num_strings = string_len; } rc = of_property_read_u32(dev->of_node, "qcom,num-strings", &val); @@ -1530,9 +1532,13 @@ static int wled_configure(struct wled *wled) return -EINVAL; } - if (string_len > 0 && val > string_len) { - dev_err(dev, "qcom,num-strings exceeds qcom,enabled-strings\n"); - return -EINVAL; + if (string_len > 0) { + dev_warn(dev, "Only one of qcom,num-strings or qcom,enabled-strings" + " should be set\n"); + if (val > string_len) { + dev_err(dev, "qcom,num-strings exceeds qcom,enabled-strings\n"); + return -EINVAL; + } } cfg->num_strings = val; |