From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 11 Mar 2019 16:34:00 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
X-Git-Tag: v5.4-rc1~1431
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bc119dd954ba172554b4cc49db249c4fb62701e6;hp=-c;p=platform%2Fkernel%2Flinux-rpi.git

Merge git://git./linux/kernel/git/davem/ide

Pull IDE updates from David Miller:
 "Nothing super exciting as usual:

  1) Switch fallthrus from Gustavo A. R. Silva

  2) Kconfig formatting cleanup from Enrico Weigelt

  3) OF interface adjustment from Rob Herring"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  drivers: ide: Kconfig: pedantic formatting
  ide: mark expected switch fall-through
  ide: hpt366: mark expected switch fall-throughs
  ide: Use of_node_name_eq for node name comparisons
---

bc119dd954ba172554b4cc49db249c4fb62701e6
diff --combined drivers/ide/ide-floppy.c
index 780d33c,c04d33d..1ea2f9e
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@@ -276,7 -276,7 +276,7 @@@ static ide_startstop_t ide_floppy_do_re
  		switch (ide_req(rq)->type) {
  		case ATA_PRIV_MISC:
  		case ATA_PRIV_SENSE:
 -			pc = (struct ide_atapi_pc *)rq->special;
 +			pc = (struct ide_atapi_pc *)ide_req(rq)->special;
  			break;
  		default:
  			BUG();
@@@ -427,7 -427,7 +427,7 @@@ static int ide_floppy_get_capacity(ide_
  				 * (maintains previous driver behaviour)
  				 */
  				break;
- 			/* else: fall through */
+ 			/* fall through */
  		case CAPACITY_CURRENT:
  			/* Normal Zip/LS-120 disks */
  			if (memcmp(cap_desc, &floppy->cap_desc, 8))