2022-06-08 06:09:27

by Stephen Kitt

[permalink] [raw]
Subject: [PATCH] staging: ftbft: Use backlight helper

backlight_properties.fb_blank is deprecated. The states it represents
are handled by other properties; but instead of accessing those
properties directly, drivers should use the helpers provided by
backlight.h.

Instead of manually checking the power state in struct
backlight_properties, use backlight_is_blank().

Signed-off-by: Stephen Kitt <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: "Noralf Trønnes" <[email protected]>
Cc: Thomas Zimmermann <[email protected]>
Cc: Andy Shevchenko <[email protected]>
Cc: Javier Martinez Canillas <[email protected]>
Cc: Len Baker <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
drivers/staging/fbtft/fb_ssd1351.c | 3 +--
drivers/staging/fbtft/fbtft-core.c | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/fbtft/fb_ssd1351.c b/drivers/staging/fbtft/fb_ssd1351.c
index 6fd549a424d5..b8d55aa8c5c7 100644
--- a/drivers/staging/fbtft/fb_ssd1351.c
+++ b/drivers/staging/fbtft/fb_ssd1351.c
@@ -196,8 +196,7 @@ static int update_onboard_backlight(struct backlight_device *bd)
"%s: power=%d, fb_blank=%d\n",
__func__, bd->props.power, bd->props.fb_blank);

- on = (bd->props.power == FB_BLANK_UNBLANK) &&
- (bd->props.fb_blank == FB_BLANK_UNBLANK);
+ on = !backlight_is_blank(bd);
/* Onboard backlight connected to GPIO0 on SSD1351, GPIO1 unused */
write_reg(par, 0xB5, on ? 0x03 : 0x02);

diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c
index 60b2278d8b16..9b3eaed80cdd 100644
--- a/drivers/staging/fbtft/fbtft-core.c
+++ b/drivers/staging/fbtft/fbtft-core.c
@@ -137,8 +137,7 @@ static int fbtft_backlight_update_status(struct backlight_device *bd)
"%s: polarity=%d, power=%d, fb_blank=%d\n",
__func__, polarity, bd->props.power, bd->props.fb_blank);

- if ((bd->props.power == FB_BLANK_UNBLANK) &&
- (bd->props.fb_blank == FB_BLANK_UNBLANK))
+ if (!backlight_is_blank(bd))
gpiod_set_value(par->gpio.led[0], polarity);
else
gpiod_set_value(par->gpio.led[0], !polarity);

base-commit: f2906aa863381afb0015a9eb7fefad885d4e5a56
--
2.30.2


2022-06-08 07:45:53

by Andy Shevchenko

[permalink] [raw]
Subject: Re: [PATCH] staging: ftbft: Use backlight helper

On Tue, Jun 07, 2022 at 08:55:16PM +0200, Stephen Kitt wrote:
> backlight_properties.fb_blank is deprecated. The states it represents
> are handled by other properties; but instead of accessing those
> properties directly, drivers should use the helpers provided by
> backlight.h.
>
> Instead of manually checking the power state in struct
> backlight_properties, use backlight_is_blank().

Reviewed-by: Andy Shevchenko <[email protected]>

> Signed-off-by: Stephen Kitt <[email protected]>
> Cc: Greg Kroah-Hartman <[email protected]>
> Cc: "Noralf Tr?nnes" <[email protected]>
> Cc: Thomas Zimmermann <[email protected]>
> Cc: Andy Shevchenko <[email protected]>
> Cc: Javier Martinez Canillas <[email protected]>
> Cc: Len Baker <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> ---
> drivers/staging/fbtft/fb_ssd1351.c | 3 +--
> drivers/staging/fbtft/fbtft-core.c | 3 +--
> 2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/fbtft/fb_ssd1351.c b/drivers/staging/fbtft/fb_ssd1351.c
> index 6fd549a424d5..b8d55aa8c5c7 100644
> --- a/drivers/staging/fbtft/fb_ssd1351.c
> +++ b/drivers/staging/fbtft/fb_ssd1351.c
> @@ -196,8 +196,7 @@ static int update_onboard_backlight(struct backlight_device *bd)
> "%s: power=%d, fb_blank=%d\n",
> __func__, bd->props.power, bd->props.fb_blank);
>
> - on = (bd->props.power == FB_BLANK_UNBLANK) &&
> - (bd->props.fb_blank == FB_BLANK_UNBLANK);
> + on = !backlight_is_blank(bd);
> /* Onboard backlight connected to GPIO0 on SSD1351, GPIO1 unused */
> write_reg(par, 0xB5, on ? 0x03 : 0x02);
>
> diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c
> index 60b2278d8b16..9b3eaed80cdd 100644
> --- a/drivers/staging/fbtft/fbtft-core.c
> +++ b/drivers/staging/fbtft/fbtft-core.c
> @@ -137,8 +137,7 @@ static int fbtft_backlight_update_status(struct backlight_device *bd)
> "%s: polarity=%d, power=%d, fb_blank=%d\n",
> __func__, polarity, bd->props.power, bd->props.fb_blank);
>
> - if ((bd->props.power == FB_BLANK_UNBLANK) &&
> - (bd->props.fb_blank == FB_BLANK_UNBLANK))
> + if (!backlight_is_blank(bd))
> gpiod_set_value(par->gpio.led[0], polarity);
> else
> gpiod_set_value(par->gpio.led[0], !polarity);
>
> base-commit: f2906aa863381afb0015a9eb7fefad885d4e5a56
> --
> 2.30.2
>

--
With Best Regards,
Andy Shevchenko


2022-06-08 15:29:29

by Daniel Thompson

[permalink] [raw]
Subject: Re: [PATCH] staging: ftbft: Use backlight helper

On Tue, Jun 07, 2022 at 08:55:16PM +0200, Stephen Kitt wrote:
> backlight_properties.fb_blank is deprecated. The states it represents
> are handled by other properties; but instead of accessing those
> properties directly, drivers should use the helpers provided by
> backlight.h.
>
> Instead of manually checking the power state in struct
> backlight_properties, use backlight_is_blank().
>
> Signed-off-by: Stephen Kitt <[email protected]>
> Cc: Greg Kroah-Hartman <[email protected]>
> Cc: "Noralf Tr?nnes" <[email protected]>
> Cc: Thomas Zimmermann <[email protected]>
> Cc: Andy Shevchenko <[email protected]>
> Cc: Javier Martinez Canillas <[email protected]>
> Cc: Len Baker <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]

Reviewed-by: Daniel Thompson <[email protected]>


Daniel.

2022-06-10 20:25:53

by Sam Ravnborg

[permalink] [raw]
Subject: Re: [PATCH] staging: ftbft: Use backlight helper

Hi Stephen,

On Tue, Jun 07, 2022 at 08:55:16PM +0200, Stephen Kitt wrote:
> backlight_properties.fb_blank is deprecated. The states it represents
> are handled by other properties; but instead of accessing those
> properties directly, drivers should use the helpers provided by
> backlight.h.
>
> Instead of manually checking the power state in struct
> backlight_properties, use backlight_is_blank().
>
> Signed-off-by: Stephen Kitt <[email protected]>
> Cc: Greg Kroah-Hartman <[email protected]>
> Cc: "Noralf Tr?nnes" <[email protected]>
> Cc: Thomas Zimmermann <[email protected]>
> Cc: Andy Shevchenko <[email protected]>
> Cc: Javier Martinez Canillas <[email protected]>
> Cc: Len Baker <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> ---
> drivers/staging/fbtft/fb_ssd1351.c | 3 +--
> drivers/staging/fbtft/fbtft-core.c | 3 +--
> 2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/fbtft/fb_ssd1351.c b/drivers/staging/fbtft/fb_ssd1351.c
> index 6fd549a424d5..b8d55aa8c5c7 100644
> --- a/drivers/staging/fbtft/fb_ssd1351.c
> +++ b/drivers/staging/fbtft/fb_ssd1351.c
> @@ -196,8 +196,7 @@ static int update_onboard_backlight(struct backlight_device *bd)
> "%s: power=%d, fb_blank=%d\n",
> __func__, bd->props.power, bd->props.fb_blank);
Could you try to kill this use of props.fb_blank too? ^^^^^^
A local variable should do the trick.

Sam

>
> - on = (bd->props.power == FB_BLANK_UNBLANK) &&
> - (bd->props.fb_blank == FB_BLANK_UNBLANK);
> + on = !backlight_is_blank(bd);
> /* Onboard backlight connected to GPIO0 on SSD1351, GPIO1 unused */
> write_reg(par, 0xB5, on ? 0x03 : 0x02);
>
> diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c
> index 60b2278d8b16..9b3eaed80cdd 100644
> --- a/drivers/staging/fbtft/fbtft-core.c
> +++ b/drivers/staging/fbtft/fbtft-core.c
> @@ -137,8 +137,7 @@ static int fbtft_backlight_update_status(struct backlight_device *bd)
> "%s: polarity=%d, power=%d, fb_blank=%d\n",
> __func__, polarity, bd->props.power, bd->props.fb_blank);
>
> - if ((bd->props.power == FB_BLANK_UNBLANK) &&
> - (bd->props.fb_blank == FB_BLANK_UNBLANK))
> + if (!backlight_is_blank(bd))
> gpiod_set_value(par->gpio.led[0], polarity);
> else
> gpiod_set_value(par->gpio.led[0], !polarity);
>
> base-commit: f2906aa863381afb0015a9eb7fefad885d4e5a56
> --
> 2.30.2

2022-06-10 21:03:43

by Sam Ravnborg

[permalink] [raw]
Subject: Re: [PATCH] staging: ftbft: Use backlight helper

On Fri, Jun 10, 2022 at 10:43:06PM +0200, Stephen Kitt wrote:
> Hi Sam,
>
> On Fri, 10 Jun 2022 22:22:59 +0200, Sam Ravnborg <[email protected]> wrote:
> > On Tue, Jun 07, 2022 at 08:55:16PM +0200, Stephen Kitt wrote:
> > > backlight_properties.fb_blank is deprecated. The states it represents
> > > are handled by other properties; but instead of accessing those
> > > properties directly, drivers should use the helpers provided by
> > > backlight.h.
> > >
> > > Instead of manually checking the power state in struct
> > > backlight_properties, use backlight_is_blank().
> > >
> > > Signed-off-by: Stephen Kitt <[email protected]>
> > > Cc: Greg Kroah-Hartman <[email protected]>
> > > Cc: "Noralf Tr?nnes" <[email protected]>
> > > Cc: Thomas Zimmermann <[email protected]>
> > > Cc: Andy Shevchenko <[email protected]>
> > > Cc: Javier Martinez Canillas <[email protected]>
> > > Cc: Len Baker <[email protected]>
> > > Cc: [email protected]
> > > Cc: [email protected]
> > > Cc: [email protected]
> > > ---
> > > drivers/staging/fbtft/fb_ssd1351.c | 3 +--
> > > drivers/staging/fbtft/fbtft-core.c | 3 +--
> > > 2 files changed, 2 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/drivers/staging/fbtft/fb_ssd1351.c
> > > b/drivers/staging/fbtft/fb_ssd1351.c index 6fd549a424d5..b8d55aa8c5c7
> > > 100644 --- a/drivers/staging/fbtft/fb_ssd1351.c
> > > +++ b/drivers/staging/fbtft/fb_ssd1351.c
> > > @@ -196,8 +196,7 @@ static int update_onboard_backlight(struct
> > > backlight_device *bd) "%s: power=%d, fb_blank=%d\n",
> > > __func__, bd->props.power, bd->props.fb_blank);
> > Could you try to kill this use of props.fb_blank too? ^^^^^^
> > A local variable should do the trick.
>
> I have a pending patch changing this to show props.state instead, that way
> the debug info shows all the backlight-relevant information from props. How
> does that sound?
In the end we want to have only _one_ state for backlight, so the
simpler solution that just use one of the helpers would be better.
For this driver there is no reason to do much anyway.

Sam

2022-06-10 22:01:31

by Stephen Kitt

[permalink] [raw]
Subject: Re: [PATCH] staging: ftbft: Use backlight helper

Hi Sam,

On Fri, 10 Jun 2022 22:22:59 +0200, Sam Ravnborg <[email protected]> wrote:
> On Tue, Jun 07, 2022 at 08:55:16PM +0200, Stephen Kitt wrote:
> > backlight_properties.fb_blank is deprecated. The states it represents
> > are handled by other properties; but instead of accessing those
> > properties directly, drivers should use the helpers provided by
> > backlight.h.
> >
> > Instead of manually checking the power state in struct
> > backlight_properties, use backlight_is_blank().
> >
> > Signed-off-by: Stephen Kitt <[email protected]>
> > Cc: Greg Kroah-Hartman <[email protected]>
> > Cc: "Noralf Trønnes" <[email protected]>
> > Cc: Thomas Zimmermann <[email protected]>
> > Cc: Andy Shevchenko <[email protected]>
> > Cc: Javier Martinez Canillas <[email protected]>
> > Cc: Len Baker <[email protected]>
> > Cc: [email protected]
> > Cc: [email protected]
> > Cc: [email protected]
> > ---
> > drivers/staging/fbtft/fb_ssd1351.c | 3 +--
> > drivers/staging/fbtft/fbtft-core.c | 3 +--
> > 2 files changed, 2 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/staging/fbtft/fb_ssd1351.c
> > b/drivers/staging/fbtft/fb_ssd1351.c index 6fd549a424d5..b8d55aa8c5c7
> > 100644 --- a/drivers/staging/fbtft/fb_ssd1351.c
> > +++ b/drivers/staging/fbtft/fb_ssd1351.c
> > @@ -196,8 +196,7 @@ static int update_onboard_backlight(struct
> > backlight_device *bd) "%s: power=%d, fb_blank=%d\n",
> > __func__, bd->props.power, bd->props.fb_blank);
> Could you try to kill this use of props.fb_blank too? ^^^^^^
> A local variable should do the trick.

I have a pending patch changing this to show props.state instead, that way
the debug info shows all the backlight-relevant information from props. How
does that sound?

Regards,

Stephen


Attachments:
(No filename) (849.00 B)
OpenPGP digital signature