diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-11 09:34:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-11 09:34:00 -0700 |
| commit | bc119dd954ba172554b4cc49db249c4fb62701e6 (patch) | |
| tree | 356dc7f175ae2cff83addf01fc40eac5a3746b7e /drivers/ide/ide-floppy.c | |
| parent | 8f49a658b4ea1d0205068da76b7c8c844817dc44 (diff) | |
| parent | dc5c37736d16ec90559888fb4c974977fc8ed1ca (diff) | |
| download | linux-bc119dd954ba172554b4cc49db249c4fb62701e6.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/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
Diffstat (limited to 'drivers/ide/ide-floppy.c')
| -rw-r--r-- | drivers/ide/ide-floppy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 780d33ccc5d8..1ea2f9e82bf8 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c @@ -427,7 +427,7 @@ static int ide_floppy_get_capacity(ide_drive_t *drive) * (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)) |