diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-22 07:40:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-22 07:40:33 -0700 |
| commit | 159127ea8318974b76542f62d6d23ec8bec91a28 (patch) | |
| tree | 33029bf5b0928b384b2aff6b8575d0e2be263829 /drivers/ide/ide-floppy.c | |
| parent | 9617ba395f05f2f836d078363463f8978b0f73bc (diff) | |
| parent | a2eed33dcdb7663170b01f05dd8d0a3323ffe4b3 (diff) | |
| download | linux-159127ea8318974b76542f62d6d23ec8bec91a28.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
Pull IDE updates from David Miller:
- Remove redundant variables (Colin Ian King)
- Expected switch fall-through annotations (Gustavo A. R. Silva)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
ide: mark expected switch fall-throughs
ide-tape: remove redundant variable buffer_size
ide: remove redundant variables queue_run_ms and left
Diffstat (limited to 'drivers/ide/ide-floppy.c')
| -rw-r--r-- | drivers/ide/ide-floppy.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 5bd2aafc3753..a8df300f949c 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c @@ -427,6 +427,7 @@ static int ide_floppy_get_capacity(ide_drive_t *drive) * (maintains previous driver behaviour) */ break; + /* else: fall through */ case CAPACITY_CURRENT: /* Normal Zip/LS-120 disks */ if (memcmp(cap_desc, &floppy->cap_desc, 8)) |