pwm_backlight: Validate dft_brightness in main probe function (83cfd726) · Commits · 戴 / test

Move the dft_brightness validity check from the DT parsing function to the main probe. In this way we can validate it in case we are booting with or without DT. Signed-off-by:

Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by:

Thierry Reding <thierry.reding@avionic-design.de>

drivers/video/backlight/pwm_bl.c

+7 −6

Original line number	Diff line number	Diff line
		@@ -134,12 +134,6 @@ static int pwm_backlight_parse_dt(struct device *dev,
		if (ret < 0)
		return ret;

		if (value >= data->max_brightness) {
		dev_warn(dev, "invalid default brightness level: %u, using %u\n",
		value, data->max_brightness - 1);
		value = data->max_brightness - 1;
		}

		data->dft_brightness = value;
		data->max_brightness--;
		}
		@@ -248,6 +242,13 @@ static int pwm_backlight_probe(struct platform_device *pdev)
		goto err_alloc;
		}

		if (data->dft_brightness > data->max_brightness) {
		dev_warn(&pdev->dev,
		"invalid default brightness level: %u, using %u\n",
		data->dft_brightness, data->max_brightness);
		data->dft_brightness = data->max_brightness;
		}

		bl->props.brightness = data->dft_brightness;
		backlight_update_status(bl);

Admin message