Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a7f7496 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents fc6eabbb 26a2c54d

drivers/auxdisplay/img-ascii-lcd.c

+3 −3
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static struct img_ascii_lcd_config boston_config = { 
static void malta_update(struct img_ascii_lcd_ctx *ctx)

{

	unsigned int i;

	int err;

	int err = 0;



	for (i = 0; i < ctx->cfg->num_chars; i++) {

		err = regmap_write(ctx->regmap,
@@ -180,7 +180,7 @@ static int sead3_wait_lcd_idle(struct img_ascii_lcd_ctx *ctx) 
static void sead3_update(struct img_ascii_lcd_ctx *ctx)

{

	unsigned int i;

	int err;

	int err = 0;



	for (i = 0; i < ctx->cfg->num_chars; i++) {

		err = sead3_wait_lcd_idle(ctx);
@@ -224,7 +224,7 @@ MODULE_DEVICE_TABLE(of, img_ascii_lcd_matches); 


/**

 * img_ascii_lcd_scroll() - scroll the display by a character

 * @arg: really a pointer to the private data structure

 * @t: really a pointer to the private data structure

 *

 * Scroll the current message along the LCD by one character, rearming the

 * timer if required.

drivers/auxdisplay/panel.c

+3 −3
Original line number Diff line number Diff line
@@ -1372,7 +1372,7 @@ static void panel_process_inputs(void) 
				break;

			input->rise_timer = 0;

			input->state = INPUT_ST_RISING;

			/* no break here, fall through */

			/* fall through */

		case INPUT_ST_RISING:

			if ((phys_curr & input->mask) != input->value) {

				input->state = INPUT_ST_LOW;
@@ -1385,11 +1385,11 @@ static void panel_process_inputs(void) 
			}

			input->high_timer = 0;

			input->state = INPUT_ST_HIGH;

			/* no break here, fall through */

			/* fall through */

		case INPUT_ST_HIGH:

			if (input_state_high(input))

				break;

			/* no break here, fall through */

			/* fall through */

		case INPUT_ST_FALLING:

			input_state_falling(input);

		}