Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Mar 2019 16:34:00 +0000 (09:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Mar 2019 16:34:00 +0000 (09:34 -0700)
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

1  2 
drivers/ide/ide-floppy.c

diff --combined drivers/ide/ide-floppy.c
index 780d33ccc5d84eef81e98f2549667aacbb981c0a,c04d33d8dc8d68866a3a3440287736cf91500dfa..1ea2f9e82bf83838caed631413f5cf8dcdb3ded0
@@@ -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))