Skip to content

Commit ab18b8f

Browse files
committed
Merge tag 'auxdisplay-v6.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay
Pull auxdisplay updates from Andy Shevchenko: - A couple of cleanups to img-ascii-lcd driver * tag 'auxdisplay-v6.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay: auxdisplay: img-ascii-lcd: Constify struct img_ascii_lcd_config auxdisplay: img-ascii-lcd: Remove an unused field in struct img_ascii_lcd_ctx
2 parents 2c8d2a5 + 93b216c commit ab18b8f

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

drivers/auxdisplay/img-ascii-lcd.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ struct img_ascii_lcd_config {
3636
* @base: the base address of the LCD registers
3737
* @regmap: the regmap through which LCD registers are accessed
3838
* @offset: the offset within regmap to the start of the LCD registers
39-
* @cfg: pointer to the LCD model configuration
4039
*/
4140
struct img_ascii_lcd_ctx {
4241
struct linedisp linedisp;
@@ -45,7 +44,6 @@ struct img_ascii_lcd_ctx {
4544
struct regmap *regmap;
4645
};
4746
u32 offset;
48-
const struct img_ascii_lcd_config *cfg;
4947
};
5048

5149
/*
@@ -71,7 +69,7 @@ static void boston_update(struct linedisp *linedisp)
7169
#endif
7270
}
7371

74-
static struct img_ascii_lcd_config boston_config = {
72+
static const struct img_ascii_lcd_config boston_config = {
7573
.num_chars = 8,
7674
.ops = {
7775
.update = boston_update,
@@ -100,7 +98,7 @@ static void malta_update(struct linedisp *linedisp)
10098
pr_err_ratelimited("Failed to update LCD display: %d\n", err);
10199
}
102100

103-
static struct img_ascii_lcd_config malta_config = {
101+
static const struct img_ascii_lcd_config malta_config = {
104102
.num_chars = 8,
105103
.external_regmap = true,
106104
.ops = {
@@ -202,7 +200,7 @@ static void sead3_update(struct linedisp *linedisp)
202200
pr_err_ratelimited("Failed to update LCD display: %d\n", err);
203201
}
204202

205-
static struct img_ascii_lcd_config sead3_config = {
203+
static const struct img_ascii_lcd_config sead3_config = {
206204
.num_chars = 16,
207205
.external_regmap = true,
208206
.ops = {

0 commit comments

Comments
 (0)