All of lore.kernel.org
 help / color / mirror / Atom feed
From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Miguel Ojeda <ojeda@kernel.org>
Cc: Robin van der Gracht <robin@protonic.nl>,
	Rob Herring <robh+dt@kernel.org>,
	Paul Burton <paulburton@kernel.org>,
	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 v8 15/21] auxdisplay: ht16k33: Move delayed work
Date: Tue, 19 Oct 2021 16:45:14 +0200	[thread overview]
Message-ID: <20211019144520.3613926-16-geert@linux-m68k.org> (raw)
In-Reply-To: <20211019144520.3613926-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>
Acked-by: Robin van der Gracht <robin@protonic.nl>
---
v8:
  - No changes,

v7:
  - Add Acked-by,

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 dcf530a9390b6f9c..b50cbf7e57ba26d7 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;
@@ -472,7 +471,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;
@@ -512,7 +511,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


  parent reply	other threads:[~2021-10-19 14:45 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-19 14:44 [PATCH v8 00/21] auxdisplay: ht16k33: Add character display support Geert Uytterhoeven
2021-10-19 14:45 ` [PATCH v8 01/21] uapi: Add <linux/map_to_14segment.h> Geert Uytterhoeven
2021-10-19 14:45 ` [PATCH v8 02/21] dt-bindings: auxdisplay: ht16k33: Document Adafruit segment displays Geert Uytterhoeven
2021-10-19 14:45 ` [PATCH v8 03/21] auxdisplay: img-ascii-lcd: Fix lock-up when displaying empty string Geert Uytterhoeven
2021-10-19 20:50   ` Miguel Ojeda
2021-10-19 21:09     ` Miguel Ojeda
2021-10-20  8:27       ` Geert Uytterhoeven
2021-10-19 14:45 ` [PATCH v8 04/21] auxdisplay: img-ascii-lcd: Add helper variable dev Geert Uytterhoeven
2021-10-19 14:45 ` [PATCH v8 05/21] auxdisplay: img-ascii-lcd: Convert device attribute to sysfs_emit() Geert Uytterhoeven
2021-10-19 14:45 ` [PATCH v8 06/21] auxdisplay: Extract character line display core support Geert Uytterhoeven
2021-10-19 14:45 ` [PATCH v8 07/21] auxdisplay: linedisp: Use kmemdup_nul() helper Geert Uytterhoeven
2021-10-19 14:45 ` [PATCH v8 08/21] auxdisplay: linedisp: Add support for changing scroll rate Geert Uytterhoeven
2021-10-19 14:45 ` [PATCH v8 09/21] auxdisplay: ht16k33: Connect backlight to fbdev Geert Uytterhoeven
2021-10-19 14:45 ` [PATCH v8 10/21] auxdisplay: ht16k33: Fix frame buffer device blanking Geert Uytterhoeven
2021-10-19 14:45 ` [PATCH v8 11/21] auxdisplay: ht16k33: Use HT16K33_FB_SIZE in ht16k33_initialize() Geert Uytterhoeven
2021-10-19 14:45 ` [PATCH v8 12/21] auxdisplay: ht16k33: Remove unneeded error check in keypad probe() Geert Uytterhoeven
2021-10-19 14:45 ` [PATCH v8 13/21] auxdisplay: ht16k33: Convert to simple i2c probe function Geert Uytterhoeven
2021-10-19 14:45 ` [PATCH v8 14/21] auxdisplay: ht16k33: Add helper variable dev Geert Uytterhoeven
2021-10-19 14:45 ` Geert Uytterhoeven [this message]
2021-10-19 14:45 ` [PATCH v8 16/21] auxdisplay: ht16k33: Extract ht16k33_brightness_set() Geert Uytterhoeven
2021-10-19 14:45 ` [PATCH v8 17/21] auxdisplay: ht16k33: Extract frame buffer probing Geert Uytterhoeven
2021-10-19 14:45 ` [PATCH v8 18/21] auxdisplay: ht16k33: Add support for segment displays Geert Uytterhoeven
2021-10-19 14:45 ` [PATCH v8 19/21] dt-bindings: auxdisplay: ht16k33: Document LED subnode Geert Uytterhoeven
2021-10-19 14:45 ` [PATCH v8 20/21] auxdisplay: ht16k33: Add LED support Geert Uytterhoeven
2021-10-19 14:45 ` [PATCH v8 21/21] auxdisplay: ht16k33: Make use of device properties Geert Uytterhoeven
2021-10-19 16:44 ` [PATCH v8 00/21] auxdisplay: ht16k33: Add character display support Miguel Ojeda
2021-10-21 21:57   ` Miguel Ojeda

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=20211019144520.3613926-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.