From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF6A8C433DF for ; Thu, 28 May 2020 13:42:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BFF2120888 for ; Thu, 28 May 2020 13:42:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="bveh5kgy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390503AbgE1Nm6 (ORCPT ); Thu, 28 May 2020 09:42:58 -0400 Received: from fllv0016.ext.ti.com ([198.47.19.142]:57134 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390497AbgE1Nm6 (ORCPT ); Thu, 28 May 2020 09:42:58 -0400 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 04SDgPjj088823; Thu, 28 May 2020 08:42:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1590673346; bh=ULyFmlrEGmPGrXR2bHss3F7PNNJPRh+eCFfoxis47/w=; h=Subject:From:To:CC:References:Date:In-Reply-To; b=bveh5kgy4OD7QMZtOHiRIgBDCLESq53RfAJ4ko0Yg+UgdydlS0lGBHp3buBq2I0tW hMIBjB6RSF3hBON+1ZFpMFp4a+aQS75DHjReTw56fZq1qQTq4sqmqt+Ael2OUcf4QV VjEBD9qn20weAwL76NkVd+e7UyoV7paBDrIHf0OM= Received: from DLEE104.ent.ti.com (dlee104.ent.ti.com [157.170.170.34]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTP id 04SDgPuT121817; Thu, 28 May 2020 08:42:25 -0500 Received: from DLEE111.ent.ti.com (157.170.170.22) by DLEE104.ent.ti.com (157.170.170.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3; Thu, 28 May 2020 08:42:25 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE111.ent.ti.com (157.170.170.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3 via Frontend Transport; Thu, 28 May 2020 08:42:25 -0500 Received: from [192.168.2.6] (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 04SDgJCp014188; Thu, 28 May 2020 08:42:20 -0500 Subject: Re: [PATCH v2 16/16] backlight: use backlight_is_blank() in all backlight drivers From: Peter Ujfalusi To: Sam Ravnborg , , Jingoo Han , Lee Jones , Daniel Thompson , Tomi Valkeinen CC: Andy Gross , Bartlomiej Zolnierkiewicz , Bjorn Andersson , Daniel Vetter , David Airlie , Douglas Anderson , Jani Nikula , Jonathan Corbet , Linus Walleij , , , Maarten Lankhorst , Maxime Ripard , Michael Hennerich , , Russell King , Support Opensource , Thierry Reding , Thomas Zimmermann , Uwe Kleine-Konig References: <20200517190139.740249-1-sam@ravnborg.org> <20200517190139.740249-17-sam@ravnborg.org> <58537a62-1188-d846-75de-165ee3dcf389@ti.com> X-Pep-Version: 2.0 Message-ID: Date: Thu, 28 May 2020 16:43:01 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.8.1 MIME-Version: 1.0 In-Reply-To: <58537a62-1188-d846-75de-165ee3dcf389@ti.com> Content-Type: multipart/mixed; boundary="------------EF1F99172B7014968494A37D" Content-Language: en-US X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org --------------EF1F99172B7014968494A37D Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable On 28/05/2020 16.39, Peter Ujfalusi wrote: > Hi Sam, >=20 > On 17/05/2020 22.01, Sam Ravnborg wrote: >> Replaces the open-coded checks of the state etc., >> with the backlight_is_blank() helper. >> This increases readability of the code and align >> the functionality across the drivers. >=20 > Thanks for the cleanup in with the series! >=20 > Checked gpio/pwm/led backlight drivers mostly: > Reviewed-by: Peter Ujfalusi Interesting, I had a typo in my e-mail address :o Let's try again: Reviewed-by: Peter Ujfalusi >=20 >> v2: >> - Fixed so changelog is readable >> >> Signed-off-by: Sam Ravnborg >> Cc: Lee Jones >> Cc: Daniel Thompson >> Cc: Jingoo Han >> Cc: Michael Hennerich >> Cc: Support Opensource >> Cc: Thierry Reding >> Cc: "Uwe Kleine-K=C3=B6nig" >> Cc: Andy Gross >> Cc: Bjorn Andersson >> Cc: linux-pwm@vger.kernel.org >> Cc: linux-arm-msm@vger.kernel.org >> Cc: patches@opensource.cirrus.com >> --- >> drivers/video/backlight/88pm860x_bl.c | 8 +------- >> drivers/video/backlight/adp5520_bl.c | 5 +---- >> drivers/video/backlight/adp8860_bl.c | 5 +---- >> drivers/video/backlight/adp8870_bl.c | 5 +---- >> drivers/video/backlight/as3711_bl.c | 8 +++----- >> drivers/video/backlight/bd6107.c | 4 +--- >> drivers/video/backlight/corgi_lcd.c | 5 +---- >> drivers/video/backlight/cr_bllcd.c | 22 +++++++--------------- >> drivers/video/backlight/da903x_bl.c | 8 +------- >> drivers/video/backlight/ep93xx_bl.c | 3 +-- >> drivers/video/backlight/gpio_backlight.c | 4 +--- >> drivers/video/backlight/hp680_bl.c | 4 +--- >> drivers/video/backlight/jornada720_bl.c | 2 +- >> drivers/video/backlight/kb3886_bl.c | 4 +--- >> drivers/video/backlight/led_bl.c | 4 +--- >> drivers/video/backlight/lm3533_bl.c | 4 +--- >> drivers/video/backlight/locomolcd.c | 4 +--- >> drivers/video/backlight/lv5207lp.c | 4 +--- >> drivers/video/backlight/max8925_bl.c | 8 +------- >> drivers/video/backlight/pwm_bl.c | 4 +--- >> drivers/video/backlight/qcom-wled.c | 4 +--- >> drivers/video/backlight/tps65217_bl.c | 4 +--- >> drivers/video/backlight/wm831x_bl.c | 8 +------- >> 23 files changed, 31 insertions(+), 100 deletions(-) >> >> diff --git a/drivers/video/backlight/88pm860x_bl.c b/drivers/video/bac= klight/88pm860x_bl.c >> index 20d96a5ac384..162c83ab0f5a 100644 >> --- a/drivers/video/backlight/88pm860x_bl.c >> +++ b/drivers/video/backlight/88pm860x_bl.c >> @@ -123,13 +123,7 @@ static int pm860x_backlight_update_status(struct = backlight_device *bl) >> { >> int brightness =3D bl->props.brightness; >> =20 >> - if (bl->props.power !=3D FB_BLANK_UNBLANK) >> - brightness =3D 0; >> - >> - if (bl->props.fb_blank !=3D FB_BLANK_UNBLANK) >> - brightness =3D 0; >> - >> - if (bl->props.state & BL_CORE_SUSPENDED) >> + if (backlight_is_blank(bl)) >> brightness =3D 0; >> =20 >> return pm860x_backlight_set(bl, brightness); >> diff --git a/drivers/video/backlight/adp5520_bl.c b/drivers/video/back= light/adp5520_bl.c >> index 0f63f76723a5..d817b0d95c9d 100644 >> --- a/drivers/video/backlight/adp5520_bl.c >> +++ b/drivers/video/backlight/adp5520_bl.c >> @@ -67,10 +67,7 @@ static int adp5520_bl_update_status(struct backligh= t_device *bl) >> { >> int brightness =3D bl->props.brightness; >> =20 >> - if (bl->props.power !=3D FB_BLANK_UNBLANK) >> - brightness =3D 0; >> - >> - if (bl->props.fb_blank !=3D FB_BLANK_UNBLANK) >> + if (backlight_is_blank(bl)) >> brightness =3D 0; >> =20 >> return adp5520_bl_set(bl, brightness); >> diff --git a/drivers/video/backlight/adp8860_bl.c b/drivers/video/back= light/adp8860_bl.c >> index 19968104fc47..a0ce2a3701fa 100644 >> --- a/drivers/video/backlight/adp8860_bl.c >> +++ b/drivers/video/backlight/adp8860_bl.c >> @@ -363,10 +363,7 @@ static int adp8860_bl_update_status(struct backli= ght_device *bl) >> { >> int brightness =3D bl->props.brightness; >> =20 >> - if (bl->props.power !=3D FB_BLANK_UNBLANK) >> - brightness =3D 0; >> - >> - if (bl->props.fb_blank !=3D FB_BLANK_UNBLANK) >> + if (backlight_is_blank(bl)) >> brightness =3D 0; >> =20 >> return adp8860_bl_set(bl, brightness); >> diff --git a/drivers/video/backlight/adp8870_bl.c b/drivers/video/back= light/adp8870_bl.c >> index 4c0032010cfe..ae4269fdb189 100644 >> --- a/drivers/video/backlight/adp8870_bl.c >> +++ b/drivers/video/backlight/adp8870_bl.c >> @@ -401,10 +401,7 @@ static int adp8870_bl_update_status(struct backli= ght_device *bl) >> { >> int brightness =3D bl->props.brightness; >> =20 >> - if (bl->props.power !=3D FB_BLANK_UNBLANK) >> - brightness =3D 0; >> - >> - if (bl->props.fb_blank !=3D FB_BLANK_UNBLANK) >> + if (backlight_is_blank(bl)) >> brightness =3D 0; >> =20 >> return adp8870_bl_set(bl, brightness); >> diff --git a/drivers/video/backlight/as3711_bl.c b/drivers/video/backl= ight/as3711_bl.c >> index 33f0f0f2e8b3..7fa76008c7bf 100644 >> --- a/drivers/video/backlight/as3711_bl.c >> +++ b/drivers/video/backlight/as3711_bl.c >> @@ -107,13 +107,11 @@ static int as3711_bl_update_status(struct backli= ght_device *bl) >> int brightness =3D bl->props.brightness; >> int ret =3D 0; >> =20 >> - dev_dbg(&bl->dev, "%s(): brightness %u, pwr %x, blank %x, state %x\n= ", >> + dev_dbg(&bl->dev, "%s(): brightness %u, pwr %x, state %x\n", >> __func__, bl->props.brightness, bl->props.power, >> - bl->props.fb_blank, bl->props.state); >> + bl->props.state); >> =20 >> - if (bl->props.power !=3D FB_BLANK_UNBLANK || >> - bl->props.fb_blank !=3D FB_BLANK_UNBLANK || >> - bl->props.state & (BL_CORE_SUSPENDED | BL_CORE_FBBLANK)) >> + if (backlight_is_blank(bl)) >> brightness =3D 0; >> =20 >> if (data->type =3D=3D AS3711_BL_SU1) { >> diff --git a/drivers/video/backlight/bd6107.c b/drivers/video/backligh= t/bd6107.c >> index d5d5fb457e78..f6a5c1dba3bc 100644 >> --- a/drivers/video/backlight/bd6107.c >> +++ b/drivers/video/backlight/bd6107.c >> @@ -84,9 +84,7 @@ static int bd6107_backlight_update_status(struct bac= klight_device *backlight) >> struct bd6107 *bd =3D bl_get_data(backlight); >> int brightness =3D backlight->props.brightness; >> =20 >> - if (backlight->props.power !=3D FB_BLANK_UNBLANK || >> - backlight->props.fb_blank !=3D FB_BLANK_UNBLANK || >> - backlight->props.state & (BL_CORE_SUSPENDED | BL_CORE_FBBLANK)) >> + if (backlight_is_blank(backlight)) >> brightness =3D 0; >> =20 >> if (brightness) { >> diff --git a/drivers/video/backlight/corgi_lcd.c b/drivers/video/backl= ight/corgi_lcd.c >> index 25ef0cbd7583..c9adf4e26355 100644 >> --- a/drivers/video/backlight/corgi_lcd.c >> +++ b/drivers/video/backlight/corgi_lcd.c >> @@ -422,10 +422,7 @@ static int corgi_bl_update_status(struct backligh= t_device *bd) >> struct corgi_lcd *lcd =3D bl_get_data(bd); >> int intensity =3D bd->props.brightness; >> =20 >> - if (bd->props.power !=3D FB_BLANK_UNBLANK) >> - intensity =3D 0; >> - >> - if (bd->props.fb_blank !=3D FB_BLANK_UNBLANK) >> + if (backlight_is_blank(bd)) >> intensity =3D 0; >> =20 >> if (corgibl_flags & CORGIBL_SUSPENDED) >> diff --git a/drivers/video/backlight/cr_bllcd.c b/drivers/video/backli= ght/cr_bllcd.c >> index 4624b7b7c6a6..d5ab7675f55c 100644 >> --- a/drivers/video/backlight/cr_bllcd.c >> +++ b/drivers/video/backlight/cr_bllcd.c >> @@ -59,26 +59,18 @@ struct cr_panel { >> =20 >> static int cr_backlight_set_intensity(struct backlight_device *bd) >> { >> - int intensity =3D bd->props.brightness; >> u32 addr =3D gpio_bar + CRVML_PANEL_PORT; >> u32 cur =3D inl(addr); >> =20 >> - if (bd->props.power =3D=3D FB_BLANK_UNBLANK) >> - intensity =3D FB_BLANK_UNBLANK; >> - if (bd->props.fb_blank =3D=3D FB_BLANK_UNBLANK) >> - intensity =3D FB_BLANK_UNBLANK; >> - if (bd->props.power =3D=3D FB_BLANK_POWERDOWN) >> - intensity =3D FB_BLANK_POWERDOWN; >> - if (bd->props.fb_blank =3D=3D FB_BLANK_POWERDOWN) >> - intensity =3D FB_BLANK_POWERDOWN; >> - >> - if (intensity =3D=3D FB_BLANK_UNBLANK) { /* FULL ON */ >> - cur &=3D ~CRVML_BACKLIGHT_OFF; >> - outl(cur, addr); >> - } else if (intensity =3D=3D FB_BLANK_POWERDOWN) { /* OFF */ >> + if (backlight_is_blank(bd)) { >> + /* OFF */ >> cur |=3D CRVML_BACKLIGHT_OFF; >> outl(cur, addr); >> - } /* anything else, don't bother */ >> + } else { >> + /* FULL ON */ >> + cur &=3D ~CRVML_BACKLIGHT_OFF; >> + outl(cur, addr); >> + } >> =20 >> return 0; >> } >> diff --git a/drivers/video/backlight/da903x_bl.c b/drivers/video/backl= ight/da903x_bl.c >> index 62540e4bdedb..ca351badfdcf 100644 >> --- a/drivers/video/backlight/da903x_bl.c >> +++ b/drivers/video/backlight/da903x_bl.c >> @@ -79,13 +79,7 @@ static int da903x_backlight_update_status(struct ba= cklight_device *bl) >> { >> int brightness =3D bl->props.brightness; >> =20 >> - if (bl->props.power !=3D FB_BLANK_UNBLANK) >> - brightness =3D 0; >> - >> - if (bl->props.fb_blank !=3D FB_BLANK_UNBLANK) >> - brightness =3D 0; >> - >> - if (bl->props.state & BL_CORE_SUSPENDED) >> + if (backlight_is_blank(bl)) >> brightness =3D 0; >> =20 >> return da903x_backlight_set(bl, brightness); >> diff --git a/drivers/video/backlight/ep93xx_bl.c b/drivers/video/backl= ight/ep93xx_bl.c >> index 4149e0b2f83c..491185df1411 100644 >> --- a/drivers/video/backlight/ep93xx_bl.c >> +++ b/drivers/video/backlight/ep93xx_bl.c >> @@ -38,8 +38,7 @@ static int ep93xxbl_update_status(struct backlight_d= evice *bl) >> { >> int brightness =3D bl->props.brightness; >> =20 >> - if (bl->props.power !=3D FB_BLANK_UNBLANK || >> - bl->props.fb_blank !=3D FB_BLANK_UNBLANK) >> + if (backlight_is_blank(bl)) >> brightness =3D 0; >> =20 >> return ep93xxbl_set(bl, brightness); >> diff --git a/drivers/video/backlight/gpio_backlight.c b/drivers/video/= backlight/gpio_backlight.c >> index 75409ddfba3e..94b65e4d2aa0 100644 >> --- a/drivers/video/backlight/gpio_backlight.c >> +++ b/drivers/video/backlight/gpio_backlight.c >> @@ -25,9 +25,7 @@ static int gpio_backlight_get_next_brightness(struct= backlight_device *bl) >> { >> int brightness =3D bl->props.brightness; >> =20 >> - if (bl->props.power !=3D FB_BLANK_UNBLANK || >> - bl->props.fb_blank !=3D FB_BLANK_UNBLANK || >> - bl->props.state & (BL_CORE_SUSPENDED | BL_CORE_FBBLANK)) >> + if (backlight_is_blank(bl)) >> brightness =3D 0; >> =20 >> return brightness; >> diff --git a/drivers/video/backlight/hp680_bl.c b/drivers/video/backli= ght/hp680_bl.c >> index 8ea42b8d9bc8..01d805ca8415 100644 >> --- a/drivers/video/backlight/hp680_bl.c >> +++ b/drivers/video/backlight/hp680_bl.c >> @@ -35,9 +35,7 @@ static void hp680bl_send_intensity(struct backlight_= device *bd) >> u16 v; >> int intensity =3D bd->props.brightness; >> =20 >> - if (bd->props.power !=3D FB_BLANK_UNBLANK) >> - intensity =3D 0; >> - if (bd->props.fb_blank !=3D FB_BLANK_UNBLANK) >> + if (backlight_is_blank(bd)) >> intensity =3D 0; >> if (hp680bl_suspended) >> intensity =3D 0; >> diff --git a/drivers/video/backlight/jornada720_bl.c b/drivers/video/b= acklight/jornada720_bl.c >> index f0385f9cf9da..996f7ba3b373 100644 >> --- a/drivers/video/backlight/jornada720_bl.c >> +++ b/drivers/video/backlight/jornada720_bl.c >> @@ -54,7 +54,7 @@ static int jornada_bl_update_status(struct backlight= _device *bd) >> jornada_ssp_start(); >> =20 >> /* If backlight is off then really turn it off */ >> - if ((bd->props.power !=3D FB_BLANK_UNBLANK) || (bd->props.fb_blank != =3D FB_BLANK_UNBLANK)) { >> + if (backlight_is_blank(bd)) { >> ret =3D jornada_ssp_byte(BRIGHTNESSOFF); >> if (ret !=3D TXDUMMY) { >> dev_info(&bd->dev, "brightness off timeout\n"); >> diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backl= ight/kb3886_bl.c >> index 1dfe13c18925..a0fd5d3d82f5 100644 >> --- a/drivers/video/backlight/kb3886_bl.c >> +++ b/drivers/video/backlight/kb3886_bl.c >> @@ -89,9 +89,7 @@ static int kb3886bl_send_intensity(struct backlight_= device *bd) >> { >> int intensity =3D bd->props.brightness; >> =20 >> - if (bd->props.power !=3D FB_BLANK_UNBLANK) >> - intensity =3D 0; >> - if (bd->props.fb_blank !=3D FB_BLANK_UNBLANK) >> + if (backlight_is_blank(bd)) >> intensity =3D 0; >> if (kb3886bl_flags & KB3886BL_SUSPENDED) >> intensity =3D 0; >> diff --git a/drivers/video/backlight/led_bl.c b/drivers/video/backligh= t/led_bl.c >> index 3f66549997c8..c655ddd99cfb 100644 >> --- a/drivers/video/backlight/led_bl.c >> +++ b/drivers/video/backlight/led_bl.c >> @@ -56,9 +56,7 @@ static int led_bl_update_status(struct backlight_dev= ice *bl) >> struct led_bl_data *priv =3D bl_get_data(bl); >> int brightness =3D bl->props.brightness; >> =20 >> - if (bl->props.power !=3D FB_BLANK_UNBLANK || >> - bl->props.fb_blank !=3D FB_BLANK_UNBLANK || >> - bl->props.state & BL_CORE_FBBLANK) >> + if (backlight_is_blank(bl)) >> brightness =3D 0; >> =20 >> if (brightness > 0) >> diff --git a/drivers/video/backlight/lm3533_bl.c b/drivers/video/backl= ight/lm3533_bl.c >> index ee09d1bd02b9..476146b62c4e 100644 >> --- a/drivers/video/backlight/lm3533_bl.c >> +++ b/drivers/video/backlight/lm3533_bl.c >> @@ -41,9 +41,7 @@ static int lm3533_bl_update_status(struct backlight_= device *bd) >> struct lm3533_bl *bl =3D bl_get_data(bd); >> int brightness =3D bd->props.brightness; >> =20 >> - if (bd->props.power !=3D FB_BLANK_UNBLANK) >> - brightness =3D 0; >> - if (bd->props.fb_blank !=3D FB_BLANK_UNBLANK) >> + if (backlight_is_blank(bd)) >> brightness =3D 0; >> =20 >> return lm3533_ctrlbank_set_brightness(&bl->cb, (u8)brightness); >> diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backl= ight/locomolcd.c >> index cdc02e04f89d..8064cad8d683 100644 >> --- a/drivers/video/backlight/locomolcd.c >> +++ b/drivers/video/backlight/locomolcd.c >> @@ -113,9 +113,7 @@ static int locomolcd_set_intensity(struct backligh= t_device *bd) >> { >> int intensity =3D bd->props.brightness; >> =20 >> - if (bd->props.power !=3D FB_BLANK_UNBLANK) >> - intensity =3D 0; >> - if (bd->props.fb_blank !=3D FB_BLANK_UNBLANK) >> + if (backlight_is_blank(bd)) >> intensity =3D 0; >> if (locomolcd_flags & LOCOMOLCD_SUSPENDED) >> intensity =3D 0; >> diff --git a/drivers/video/backlight/lv5207lp.c b/drivers/video/backli= ght/lv5207lp.c >> index c6ad73a784e2..ef8aa9803577 100644 >> --- a/drivers/video/backlight/lv5207lp.c >> +++ b/drivers/video/backlight/lv5207lp.c >> @@ -48,9 +48,7 @@ static int lv5207lp_backlight_update_status(struct b= acklight_device *backlight) >> struct lv5207lp *lv =3D bl_get_data(backlight); >> int brightness =3D backlight->props.brightness; >> =20 >> - if (backlight->props.power !=3D FB_BLANK_UNBLANK || >> - backlight->props.fb_blank !=3D FB_BLANK_UNBLANK || >> - backlight->props.state & (BL_CORE_SUSPENDED | BL_CORE_FBBLANK)) >> + if (backlight_is_blank(backlight)) >> brightness =3D 0; >> =20 >> if (brightness) { >> diff --git a/drivers/video/backlight/max8925_bl.c b/drivers/video/back= light/max8925_bl.c >> index 97cc260ff9d1..b8af2c6407d3 100644 >> --- a/drivers/video/backlight/max8925_bl.c >> +++ b/drivers/video/backlight/max8925_bl.c >> @@ -66,13 +66,7 @@ static int max8925_backlight_update_status(struct b= acklight_device *bl) >> { >> int brightness =3D bl->props.brightness; >> =20 >> - if (bl->props.power !=3D FB_BLANK_UNBLANK) >> - brightness =3D 0; >> - >> - if (bl->props.fb_blank !=3D FB_BLANK_UNBLANK) >> - brightness =3D 0; >> - >> - if (bl->props.state & BL_CORE_SUSPENDED) >> + if (backlight_is_blank(bl)) >> brightness =3D 0; >> =20 >> return max8925_backlight_set(bl, brightness); >> diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backligh= t/pwm_bl.c >> index 82b8d7594701..7d0ffcd37f07 100644 >> --- a/drivers/video/backlight/pwm_bl.c >> +++ b/drivers/video/backlight/pwm_bl.c >> @@ -111,9 +111,7 @@ static int pwm_backlight_update_status(struct back= light_device *bl) >> int brightness =3D bl->props.brightness; >> struct pwm_state state; >> =20 >> - if (bl->props.power !=3D FB_BLANK_UNBLANK || >> - bl->props.fb_blank !=3D FB_BLANK_UNBLANK || >> - bl->props.state & BL_CORE_FBBLANK) >> + if (backlight_is_blank(bl)) >> brightness =3D 0; >> =20 >> if (pb->notify) >> diff --git a/drivers/video/backlight/qcom-wled.c b/drivers/video/backl= ight/qcom-wled.c >> index 3d276b30a78c..9600f5d58ece 100644 >> --- a/drivers/video/backlight/qcom-wled.c >> +++ b/drivers/video/backlight/qcom-wled.c >> @@ -261,9 +261,7 @@ static int wled_update_status(struct backlight_dev= ice *bl) >> u16 brightness =3D bl->props.brightness; >> int rc =3D 0; >> =20 >> - if (bl->props.power !=3D FB_BLANK_UNBLANK || >> - bl->props.fb_blank !=3D FB_BLANK_UNBLANK || >> - bl->props.state & BL_CORE_FBBLANK) >> + if (backlight_is_blank(bl)) >> brightness =3D 0; >> =20 >> mutex_lock(&wled->lock); >> diff --git a/drivers/video/backlight/tps65217_bl.c b/drivers/video/bac= klight/tps65217_bl.c >> index 762e3feed097..1041e5e62ee3 100644 >> --- a/drivers/video/backlight/tps65217_bl.c >> +++ b/drivers/video/backlight/tps65217_bl.c >> @@ -82,9 +82,7 @@ static int tps65217_bl_update_status(struct backligh= t_device *bl) >> if (bl->props.state & BL_CORE_SUSPENDED) >> brightness =3D 0; >> =20 >> - if ((bl->props.power !=3D FB_BLANK_UNBLANK) || >> - (bl->props.fb_blank !=3D FB_BLANK_UNBLANK)) >> - /* framebuffer in low power mode or blanking active */ >> + if (backlight_is_blank(bl)) >> brightness =3D 0; >> =20 >> if (brightness > 0) { >> diff --git a/drivers/video/backlight/wm831x_bl.c b/drivers/video/backl= ight/wm831x_bl.c >> index e55977d54c15..dc2ab6c8b7f9 100644 >> --- a/drivers/video/backlight/wm831x_bl.c >> +++ b/drivers/video/backlight/wm831x_bl.c >> @@ -93,13 +93,7 @@ static int wm831x_backlight_update_status(struct ba= cklight_device *bl) >> { >> int brightness =3D bl->props.brightness; >> =20 >> - if (bl->props.power !=3D FB_BLANK_UNBLANK) >> - brightness =3D 0; >> - >> - if (bl->props.fb_blank !=3D FB_BLANK_UNBLANK) >> - brightness =3D 0; >> - >> - if (bl->props.state & BL_CORE_SUSPENDED) >> + if (backlight_is_blank(bl)) >> brightness =3D 0; >> =20 >> return wm831x_backlight_set(bl, brightness); >> >=20 > - P=C3=A9ter >=20 > Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. > Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki >=20 - P=C3=A9ter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki --------------EF1F99172B7014968494A37D Content-Type: application/pgp-keys; name="pEpkey.asc" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="pEpkey.asc" -----BEGIN PGP PUBLIC KEY BLOCK----- mQENBFki4nsBCAD3BM+Ogt951JlaDloruEjoZk/Z+/37CjP0fY2mqLhBOzkpx95u X1Fquf0KfVk+ZzCd25XGOZEtpZNlXfbxRr2iRWPS5RW2FeLYGvg2TTJCpSr+ugKu OOec6KECCUotGbGhpYwBrbarJNEwDcAzPK7UJYa1rhWOmkpZJ1hXF1hUghB84q35 8DmN4sGLcsIbVdRFZ1tWFh4vGBFV9LsoDZIrnnANb6/XMX78s+tr3RG3GZBaFPl8 jO5IIv0UIGNUKaYlNVFYthjGCzOqtstHchWuK9eQkR7m1+Vc+ezh1qK0VJydIcjn OtoMZZL7RAz13LB9vmcJjbQPnI7dJojz/M7zABEBAAG0JlBldGVyIFVqZmFsdXNp IDxwZXRlci51amZhbHVzaUB0aS5jb20+iQFOBBMBCAA4FiEE+dBcpRFvJjZw+uta LCayis85LN4FAlki4nsCGwMFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQLCay is85LN4QjggAzxxxXqiWpA3vuj9yrlGLft3BeGKWqF8+RzdeRvshtNdpGeIFf+r5 AJVR71R1w89Qeb4DGXus7qsKiafdFGG7yxbuhw8a5wUm+ZncBXA+ETn3OyVtl8g8 r/ZcPX420jClBNTVuL0sSnyqDFDrt5f+uAFOIwsnHdpns174Zu9QhgYxdvdZ+jMh Psb745O9EVeNvdfUIRdrVjb4IhJKNIzkb0Tulsz5xeCJReUYpxZU1jzEq3YZqIou +fi+oS4wlJuSoxKKTmIXtSeEy/weStF1XHMo6vLYqzaK4FyIuclqeuYUYSVy2425 7TMXugaI+O85AEI6KW8MCcu1NucSfAWUabkBDQRZIuJ7AQgAypKq8iIugpHxWA2c Ck6MQdPBT6cOEVK0tjeHaHAVOUPiw9Pq+ssMifdIkDdqXNZ3RLH/X2svYvd8c81C egqshfB8nkJ5EKmQc9d7s0EwnYT8OwsoVb3c2WXnsdcKEyu2nHgyeJEUpPpMPyLc +PWhoREifttab4sOPktepdnUbvrDK/gkjHmiG6+L2owSn637N+Apo3/eQuDajfEu kybxK19ReRcp6dbqWSBGSeNB32c/zv1ka37bTMNVUY39Rl+/8lA/utLfrMeACHRO FGO1BexMASKUdmlB0v9n4BaJFGrAJYAFJBNHLCDemqkU7gjaiimuHSjwuP0Wk7Ct KQJfVQARAQABiQE2BBgBCAAgFiEE+dBcpRFvJjZw+utaLCayis85LN4FAlki4nsC GwwACgkQLCayis85LN7kCwgAoy9r3ZQfJNOXO1q/YQfpEELHn0p8LpwliSDUS1xL sswyxtZS8LlW8PjlTXuBLu38Vfr0vGav7oyV7TkhnKT3oBOLXanyZqwgyZSKNEGB PB4v3Fo7YTzpfSofiwuz03uyfjTxiMGjonxSb+YxM7HBHfzjrOKKlg02fK+lWNZo m5lXugeWD7U6JJguNdYfr+U4zYIblelUImcIE+wnR0oLzUEVDIWSpVrl/OqS3Rzo mw8wBsHksTHrbgUnKL0SCzYc90BTeKbyjEBnVDr+dlfbxRxkB8h9RMPMdjodvXzS Gfsa9V/k4XAsh7iX9EUVBbnmjA61ySxU/w98h96jMuteTg=3D=3D =3DeQmw -----END PGP PUBLIC KEY BLOCK----- --------------EF1F99172B7014968494A37D--