From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Robin van der Gracht <robin@protonic.nl>,
Rob Herring <robh+dt@kernel.org>, Miguel Ojeda <ojeda@kernel.org>,
Paul Burton <paulburton@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Pavel Machek <pavel@ucw.cz>, Marek Behun <marek.behun@nic.cz>
Cc: devicetree@vger.kernel.org, linux-leds@vger.kernel.org,
linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org,
Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [PATCH v3 15/19] auxdisplay: ht16k33: Extract ht16k33_brightness_set()
Date: Wed, 14 Jul 2021 17:11:26 +0200 [thread overview]
Message-ID: <20210714151130.2531831-16-geert@linux-m68k.org> (raw)
In-Reply-To: <20210714151130.2531831-1-geert@linux-m68k.org>
Extract brightness handling into a helper function, so it can be called
from multiple places.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
v3:
- Use "err" instead of "error" to be consistent with existing driver
naming style,
v2:
- No changes.
---
drivers/auxdisplay/ht16k33.c | 25 +++++++++++++++++++------
1 file changed, 19 insertions(+), 6 deletions(-)
diff --git a/drivers/auxdisplay/ht16k33.c b/drivers/auxdisplay/ht16k33.c
index c7a3a0e1fbb5d03e..928ac9722c142855 100644
--- a/drivers/auxdisplay/ht16k33.c
+++ b/drivers/auxdisplay/ht16k33.c
@@ -113,6 +113,22 @@ static int ht16k33_display_off(struct ht16k33_priv *priv)
return i2c_smbus_write_byte(priv->client, REG_DISPLAY_SETUP);
}
+static int ht16k33_brightness_set(struct ht16k33_priv *priv,
+ unsigned int brightness)
+{
+ int err;
+
+ if (brightness == 0)
+ return ht16k33_display_off(priv);
+
+ err = ht16k33_display_on(priv);
+ if (err)
+ return err;
+
+ return i2c_smbus_write_byte(priv->client,
+ REG_BRIGHTNESS | (brightness - 1));
+}
+
static void ht16k33_fb_queue(struct ht16k33_priv *priv)
{
struct ht16k33_fbdev *fbdev = &priv->fbdev;
@@ -197,13 +213,10 @@ static int ht16k33_bl_update_status(struct backlight_device *bl)
if (bl->props.power != FB_BLANK_UNBLANK ||
bl->props.fb_blank != FB_BLANK_UNBLANK ||
- bl->props.state & BL_CORE_FBBLANK || brightness == 0) {
- return ht16k33_display_off(priv);
- }
+ bl->props.state & BL_CORE_FBBLANK)
+ brightness = 0;
- ht16k33_display_on(priv);
- return i2c_smbus_write_byte(priv->client,
- REG_BRIGHTNESS | (brightness - 1));
+ return ht16k33_brightness_set(priv, brightness);
}
static int ht16k33_bl_check_fb(struct backlight_device *bl, struct fb_info *fi)
--
2.25.1
next prev parent reply other threads:[~2021-07-14 15:12 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-14 15:11 [PATCH v3 00/19] auxdisplay: ht16k33: Add character display support Geert Uytterhoeven
2021-07-14 15:11 ` [PATCH v3 01/19] uapi: Add <linux/map_to_14segment.h> Geert Uytterhoeven
2021-07-14 15:11 ` [PATCH v3 02/19] dt-bindings: auxdisplay: ht16k33: Document Adafruit segment displays Geert Uytterhoeven
2021-07-14 15:11 ` [PATCH v3 03/19] auxdisplay: img-ascii-lcd: Fix lock-up when displaying empty string Geert Uytterhoeven
2021-07-14 15:11 ` [PATCH v3 04/19] auxdisplay: img-ascii-lcd: Add helper variable dev Geert Uytterhoeven
2021-07-14 15:11 ` [PATCH v3 05/19] auxdisplay: img-ascii-lcd: Convert device attribute to sysfs_emit() Geert Uytterhoeven
2021-07-14 15:11 ` [PATCH v3 06/19] auxdisplay: Extract character line display core support Geert Uytterhoeven
2021-07-14 15:11 ` [PATCH v3 07/19] auxdisplay: linedisp: Use kmemdup_nul() helper Geert Uytterhoeven
2021-07-14 15:11 ` [PATCH v3 08/19] auxdisplay: linedisp: Add support for changing scroll rate Geert Uytterhoeven
2021-07-14 15:11 ` [PATCH v3 09/19] auxdisplay: ht16k33: Connect backlight to fbdev Geert Uytterhoeven
2021-07-14 15:11 ` [PATCH v3 10/19] auxdisplay: ht16k33: Use HT16K33_FB_SIZE in ht16k33_initialize() Geert Uytterhoeven
2021-07-14 15:11 ` [PATCH v3 11/19] auxdisplay: ht16k33: Remove unneeded error check in keypad probe() Geert Uytterhoeven
2021-07-14 15:11 ` [PATCH v3 12/19] auxdisplay: ht16k33: Convert to simple i2c probe function Geert Uytterhoeven
2021-07-14 15:11 ` [PATCH v3 13/19] auxdisplay: ht16k33: Add helper variable dev Geert Uytterhoeven
2021-07-14 15:11 ` [PATCH v3 14/19] auxdisplay: ht16k33: Move delayed work Geert Uytterhoeven
2021-07-14 15:11 ` Geert Uytterhoeven [this message]
2021-07-14 15:11 ` [PATCH v3 16/19] auxdisplay: ht16k33: Extract frame buffer probing Geert Uytterhoeven
2021-07-14 15:11 ` [PATCH v3 17/19] auxdisplay: ht16k33: Add support for segment displays Geert Uytterhoeven
2021-07-14 15:11 ` [PATCH v3 18/19] dt-bindings: auxdisplay: ht16k33: Document LED subnode Geert Uytterhoeven
2021-07-16 19:24 ` Rob Herring
2021-07-14 15:11 ` [PATCH v3 19/19] auxdisplay: ht16k33: Add LED support Geert Uytterhoeven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210714151130.2531831-16-geert@linux-m68k.org \
--to=geert@linux-m68k.org \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=marek.behun@nic.cz \
--cc=ojeda@kernel.org \
--cc=paulburton@kernel.org \
--cc=pavel@ucw.cz \
--cc=robh+dt@kernel.org \
--cc=robin@protonic.nl \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).