From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Robin van der Gracht <robin@protonic.nl>,
Miguel Ojeda <ojeda@kernel.org>, Rob Herring <robh+dt@kernel.org>,
Paul Burton <paulburton@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Pavel Machek <pavel@ucw.cz>, Marek Behun <marek.behun@nic.cz>,
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 v6 14/19] auxdisplay: ht16k33: Move delayed work
Date: Tue, 14 Sep 2021 16:38:30 +0200 [thread overview]
Message-ID: <20210914143835.511051-15-geert@linux-m68k.org> (raw)
In-Reply-To: <20210914143835.511051-1-geert@linux-m68k.org>
Move delayed_work from ht16k33_fbdev to ht16k33_priv, as it is not
specific to dot-matrix displays, but common to all display types.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
v6:
- No changes,
v5:
- No changes,
v4:
- No changes,
v3:
- No changes,
v2:
- No changes.
---
drivers/auxdisplay/ht16k33.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/auxdisplay/ht16k33.c b/drivers/auxdisplay/ht16k33.c
index 75d326a823543898..c7a3a0e1fbb5d03e 100644
--- a/drivers/auxdisplay/ht16k33.c
+++ b/drivers/auxdisplay/ht16k33.c
@@ -65,11 +65,11 @@ struct ht16k33_fbdev {
uint32_t refresh_rate;
uint8_t *buffer;
uint8_t *cache;
- struct delayed_work work;
};
struct ht16k33_priv {
struct i2c_client *client;
+ struct delayed_work work;
struct ht16k33_keypad keypad;
struct ht16k33_fbdev fbdev;
};
@@ -117,7 +117,7 @@ static void ht16k33_fb_queue(struct ht16k33_priv *priv)
{
struct ht16k33_fbdev *fbdev = &priv->fbdev;
- schedule_delayed_work(&fbdev->work, HZ / fbdev->refresh_rate);
+ schedule_delayed_work(&priv->work, HZ / fbdev->refresh_rate);
}
/*
@@ -125,10 +125,9 @@ static void ht16k33_fb_queue(struct ht16k33_priv *priv)
*/
static void ht16k33_fb_update(struct work_struct *work)
{
- struct ht16k33_fbdev *fbdev =
- container_of(work, struct ht16k33_fbdev, work.work);
- struct ht16k33_priv *priv =
- container_of(fbdev, struct ht16k33_priv, fbdev);
+ struct ht16k33_priv *priv = container_of(work, struct ht16k33_priv,
+ work.work);
+ struct ht16k33_fbdev *fbdev = &priv->fbdev;
uint8_t *p1, *p2;
int len, pos = 0, first = -1;
@@ -462,7 +461,7 @@ static int ht16k33_probe(struct i2c_client *client)
}
fb_bl_default_curve(fbdev->info, 0, MIN_BRIGHTNESS, MAX_BRIGHTNESS);
- INIT_DELAYED_WORK(&fbdev->work, ht16k33_fb_update);
+ INIT_DELAYED_WORK(&priv->work, ht16k33_fb_update);
fbdev->info->fbops = &ht16k33_fb_ops;
fbdev->info->screen_base = (char __iomem *) fbdev->buffer;
fbdev->info->screen_size = HT16K33_FB_SIZE;
@@ -502,7 +501,7 @@ static int ht16k33_remove(struct i2c_client *client)
struct ht16k33_priv *priv = i2c_get_clientdata(client);
struct ht16k33_fbdev *fbdev = &priv->fbdev;
- cancel_delayed_work_sync(&fbdev->work);
+ cancel_delayed_work_sync(&priv->work);
unregister_framebuffer(fbdev->info);
framebuffer_release(fbdev->info);
free_page((unsigned long) fbdev->buffer);
--
2.25.1
next prev parent reply other threads:[~2021-09-14 14:39 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-14 14:38 [PATCH v6 00/19] auxdisplay: ht16k33: Add character display support Geert Uytterhoeven
2021-09-14 14:38 ` [PATCH v6 01/19] uapi: Add <linux/map_to_14segment.h> Geert Uytterhoeven
2021-09-14 14:38 ` [PATCH v6 02/19] dt-bindings: auxdisplay: ht16k33: Document Adafruit segment displays Geert Uytterhoeven
2021-09-14 14:38 ` [PATCH v6 03/19] auxdisplay: img-ascii-lcd: Fix lock-up when displaying empty string Geert Uytterhoeven
2021-09-14 14:38 ` [PATCH v6 04/19] auxdisplay: img-ascii-lcd: Add helper variable dev Geert Uytterhoeven
2021-09-14 14:38 ` [PATCH v6 05/19] auxdisplay: img-ascii-lcd: Convert device attribute to sysfs_emit() Geert Uytterhoeven
2021-09-14 14:38 ` [PATCH v6 06/19] auxdisplay: Extract character line display core support Geert Uytterhoeven
2021-09-14 14:38 ` [PATCH v6 07/19] auxdisplay: linedisp: Use kmemdup_nul() helper Geert Uytterhoeven
2021-09-14 14:38 ` [PATCH v6 08/19] auxdisplay: linedisp: Add support for changing scroll rate Geert Uytterhoeven
2021-09-14 14:38 ` [PATCH v6 09/19] auxdisplay: ht16k33: Connect backlight to fbdev Geert Uytterhoeven
2021-09-29 14:21 ` Robin van der Gracht
2021-09-14 14:38 ` [PATCH v6 10/19] auxdisplay: ht16k33: Use HT16K33_FB_SIZE in ht16k33_initialize() Geert Uytterhoeven
2021-09-14 14:38 ` [PATCH v6 11/19] auxdisplay: ht16k33: Remove unneeded error check in keypad probe() Geert Uytterhoeven
2021-09-14 14:38 ` [PATCH v6 12/19] auxdisplay: ht16k33: Convert to simple i2c probe function Geert Uytterhoeven
2021-09-14 14:38 ` [PATCH v6 13/19] auxdisplay: ht16k33: Add helper variable dev Geert Uytterhoeven
2021-09-14 14:38 ` Geert Uytterhoeven [this message]
2021-09-30 6:36 ` [PATCH v6 14/19] auxdisplay: ht16k33: Move delayed work Robin van der Gracht
2021-09-14 14:38 ` [PATCH v6 15/19] auxdisplay: ht16k33: Extract ht16k33_brightness_set() Geert Uytterhoeven
2021-09-30 6:58 ` Robin van der Gracht
2021-09-14 14:38 ` [PATCH v6 16/19] auxdisplay: ht16k33: Extract frame buffer probing Geert Uytterhoeven
2021-09-30 7:09 ` Robin van der Gracht
2021-09-14 14:38 ` [PATCH v6 17/19] auxdisplay: ht16k33: Add support for segment displays Geert Uytterhoeven
2021-09-30 7:37 ` Robin van der Gracht
2021-09-14 14:38 ` [PATCH v6 18/19] dt-bindings: auxdisplay: ht16k33: Document LED subnode Geert Uytterhoeven
2021-09-14 14:38 ` [PATCH v6 19/19] auxdisplay: ht16k33: Add LED support Geert Uytterhoeven
2021-09-30 10:57 ` Robin van der Gracht
2021-10-01 15:51 ` Geert Uytterhoeven
2021-10-04 8:26 ` Robin van der Gracht
2021-10-12 15:08 ` 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=20210914143835.511051-15-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).