Skip to content

Commit 1a7f749

Browse files
committed
Merge tag 'auxdisplay-for-linus-v4.16-rc6' of git://github.com/ojeda/linux
Pull auxdisplay fixes from Miguel Ojeda: "Silence a few warnings in auxdisplay. - a couple of uninitialized warnings reported by the build service - a doc comment warning under W=1 - three fall-through comments not recognized under W=1" * tag 'auxdisplay-for-linus-v4.16-rc6' of git://github.com/ojeda/linux: auxdisplay: img-ascii-lcd: Silence 2 uninitialized warnings auxdisplay: img-ascii-lcd: Fix doc comment to silence warnings auxdisplay: panel: Change comments to silence fallthrough warnings
2 parents fc6eabb + 26a2c54 commit 1a7f749

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

drivers/auxdisplay/img-ascii-lcd.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ static struct img_ascii_lcd_config boston_config = {
9797
static void malta_update(struct img_ascii_lcd_ctx *ctx)
9898
{
9999
unsigned int i;
100-
int err;
100+
int err = 0;
101101

102102
for (i = 0; i < ctx->cfg->num_chars; i++) {
103103
err = regmap_write(ctx->regmap,
@@ -180,7 +180,7 @@ static int sead3_wait_lcd_idle(struct img_ascii_lcd_ctx *ctx)
180180
static void sead3_update(struct img_ascii_lcd_ctx *ctx)
181181
{
182182
unsigned int i;
183-
int err;
183+
int err = 0;
184184

185185
for (i = 0; i < ctx->cfg->num_chars; i++) {
186186
err = sead3_wait_lcd_idle(ctx);
@@ -224,7 +224,7 @@ MODULE_DEVICE_TABLE(of, img_ascii_lcd_matches);
224224

225225
/**
226226
* img_ascii_lcd_scroll() - scroll the display by a character
227-
* @arg: really a pointer to the private data structure
227+
* @t: really a pointer to the private data structure
228228
*
229229
* Scroll the current message along the LCD by one character, rearming the
230230
* timer if required.

drivers/auxdisplay/panel.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1372,7 +1372,7 @@ static void panel_process_inputs(void)
13721372
break;
13731373
input->rise_timer = 0;
13741374
input->state = INPUT_ST_RISING;
1375-
/* no break here, fall through */
1375+
/* fall through */
13761376
case INPUT_ST_RISING:
13771377
if ((phys_curr & input->mask) != input->value) {
13781378
input->state = INPUT_ST_LOW;
@@ -1385,11 +1385,11 @@ static void panel_process_inputs(void)
13851385
}
13861386
input->high_timer = 0;
13871387
input->state = INPUT_ST_HIGH;
1388-
/* no break here, fall through */
1388+
/* fall through */
13891389
case INPUT_ST_HIGH:
13901390
if (input_state_high(input))
13911391
break;
1392-
/* no break here, fall through */
1392+
/* fall through */
13931393
case INPUT_ST_FALLING:
13941394
input_state_falling(input);
13951395
}

0 commit comments

Comments
 (0)