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

Commit 20eabc89 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'Wimplicit-fallthrough-5.3-rc6' of... 

Merge tag 'Wimplicit-fallthrough-5.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux

Pull more fallthrough fixes from Gustavo A. R. Silva:
 "Fix fall-through warnings on arm and mips for multiple configurations"

* tag 'Wimplicit-fallthrough-5.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux:
  video: fbdev: acornfb: Mark expected switch fall-through
  scsi: libsas: sas_discover: Mark expected switch fall-through
  MIPS: Octeon: Mark expected switch fall-through
  power: supply: ab8500_charger: Mark expected switch fall-through
  watchdog: wdt285: Mark expected switch fall-through
  mtd: sa1100: Mark expected switch fall-through
  drm/sun4i: tcon: Mark expected switch fall-through
  drm/sun4i: sun6i_mipi_dsi: Mark expected switch fall-through
  ARM: riscpc: Mark expected switch fall-through
  dmaengine: fsldma: Mark expected switch fall-through
parents e5b7c167 c3cb6674

arch/arm/mach-rpc/riscpc.c

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ static int __init parse_tag_acorn(const struct tag *tag) 
	switch (tag->u.acorn.vram_pages) {

	case 512:

		vram_size += PAGE_SIZE * 256;

		/* Fall through - ??? */

	case 256:

		vram_size += PAGE_SIZE * 256;

	default:

arch/mips/include/asm/octeon/cvmx-sli-defs.h

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ static inline uint64_t CVMX_SLI_PCIE_MSI_RCV_FUNC(void) 
	case OCTEON_CN78XX & OCTEON_FAMILY_MASK:

		if (OCTEON_IS_MODEL(OCTEON_CN78XX_PASS1_X))

			return 0x0000000000003CB0ull;

		/* Else, fall through */

	default:

		return 0x0000000000023CB0ull;

	}

drivers/dma/fsldma.c

+1 −0
Original line number Diff line number Diff line
@@ -1163,6 +1163,7 @@ static int fsl_dma_chan_probe(struct fsldma_device *fdev, 
	switch (chan->feature & FSL_DMA_IP_MASK) {

	case FSL_DMA_IP_85XX:

		chan->toggle_ext_pause = fsl_chan_toggle_ext_pause;

		/* Fall through */

	case FSL_DMA_IP_83XX:

		chan->toggle_ext_start = fsl_chan_toggle_ext_start;

		chan->set_src_loop_size = fsl_chan_set_src_loop_size;

drivers/gpu/drm/sun4i/sun4i_tcon.c

+1 −0
Original line number Diff line number Diff line
@@ -314,6 +314,7 @@ static void sun4i_tcon0_mode_set_dithering(struct sun4i_tcon *tcon, 
		/* R and B components are only 5 bits deep */

		val |= SUN4I_TCON0_FRM_CTL_MODE_R;

		val |= SUN4I_TCON0_FRM_CTL_MODE_B;

		/* Fall through */

	case MEDIA_BUS_FMT_RGB666_1X18:

	case MEDIA_BUS_FMT_RGB666_1X7X3_SPWG:

		/* Fall through: enable dithering */

drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c

+1 −0
Original line number Diff line number Diff line
@@ -993,6 +993,7 @@ static ssize_t sun6i_dsi_transfer(struct mipi_dsi_host *host, 
			ret = sun6i_dsi_dcs_read(dsi, msg);

			break;

		}

		/* Else, fall through */



	default:

		ret = -EINVAL;