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-taskfile.c | |
| parent | 9617ba395f05f2f836d078363463f8978b0f73bc (diff) | |
| parent | a2eed33dcdb7663170b01f05dd8d0a3323ffe4b3 (diff) | |
| download | linux-159127ea8318974b76542f62d6d23ec8bec91a28.tar.gz linux-159127ea8318974b76542f62d6d23ec8bec91a28.tar.bz2 linux-159127ea8318974b76542f62d6d23ec8bec91a28.zip | |
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-taskfile.c')
| -rw-r--r-- | drivers/ide/ide-taskfile.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c index 89b29028d315..c21d5c50ae3a 100644 --- a/drivers/ide/ide-taskfile.c +++ b/drivers/ide/ide-taskfile.c @@ -128,7 +128,7 @@ ide_startstop_t do_rw_taskfile(ide_drive_t *drive, struct ide_cmd *orig_cmd) return pre_task_out_intr(drive, cmd); } handler = task_pio_intr; - /* fall-through */ + /* fall through */ case ATA_PROT_NODATA: if (handler == NULL) handler = task_no_data_intr; @@ -140,6 +140,7 @@ ide_startstop_t do_rw_taskfile(ide_drive_t *drive, struct ide_cmd *orig_cmd) hwif->expiry = dma_ops->dma_timer_expiry; ide_execute_command(drive, cmd, ide_dma_intr, 2 * WAIT_CMD); dma_ops->dma_start(drive); + /* fall through */ default: return ide_started; } |