diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2024-02-12 19:01:34 +0200 |
|---|---|---|
| committer | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2024-02-15 13:24:53 +0200 |
| commit | a8fc3d587fa6de33c2ade327bd9d4fcbb16148f0 (patch) | |
| tree | bb0f056a930f87e0e3908518afb7a8432e580cbf | |
| parent | b33190d0fd9099e7eed208716269c53a8a536dfa (diff) | |
| download | linux-stable-a8fc3d587fa6de33c2ade327bd9d4fcbb16148f0.tar.gz linux-stable-a8fc3d587fa6de33c2ade327bd9d4fcbb16148f0.tar.bz2 linux-stable-a8fc3d587fa6de33c2ade327bd9d4fcbb16148f0.zip | |
auxdisplay: img-ascii-lcd: Make container_of() no-op for struct linedisp
Move embedded struct linedisp member to make container_of() no-op.
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
| -rw-r--r-- | drivers/auxdisplay/img-ascii-lcd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/auxdisplay/img-ascii-lcd.c b/drivers/auxdisplay/img-ascii-lcd.c index 56efda0740fb..09014ada38bd 100644 --- a/drivers/auxdisplay/img-ascii-lcd.c +++ b/drivers/auxdisplay/img-ascii-lcd.c @@ -32,21 +32,21 @@ struct img_ascii_lcd_config { /** * struct img_ascii_lcd_ctx - Private data structure + * @linedisp: line display structure * @base: the base address of the LCD registers * @regmap: the regmap through which LCD registers are accessed * @offset: the offset within regmap to the start of the LCD registers * @cfg: pointer to the LCD model configuration - * @linedisp: line display structure * @curr: the string currently displayed on the LCD */ struct img_ascii_lcd_ctx { + struct linedisp linedisp; union { void __iomem *base; struct regmap *regmap; }; u32 offset; const struct img_ascii_lcd_config *cfg; - struct linedisp linedisp; char curr[] __aligned(8); }; |