Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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

Linus Torvalds 7 years ago 159127ea 9617ba39

+8 -9

7 changed files

expand all

drivers

ide

hpt366.c

ide-floppy.c

ide-io.c

ide-probe.c

ide-tape.c

ide-taskfile.c

sis5513.c

+3 -2

drivers/ide/hpt366.c

··· 574 574 if (!HPT370_ALLOW_ATA100_5 || 575 575 check_in_drive_list(drive, bad_ata100_5)) 576 576 return ATA_UDMA4; 577 + /* else: fall through */ 577 578 case HPT372 : 578 579 case HPT372A: 579 580 case HPT372N: 580 581 case HPT374 : 581 582 if (ata_id_is_sata(drive->id)) 582 583 mask &= ~0x0e; 583 - /* Fall thru */ 584 + /* fall through */ 584 585 default: 585 586 return mask; 586 587 } ··· 601 600 case HPT374 : 602 601 if (ata_id_is_sata(drive->id)) 603 602 return 0x00; 604 - /* Fall thru */ 603 + /* else: fall through */ 605 604 default: 606 605 return 0x07; 607 606 }

drivers/ide/ide-floppy.c

··· 427 427 * (maintains previous driver behaviour) 428 428 */ 429 429 break; 430 + /* else: fall through */ 430 431 case CAPACITY_CURRENT: 431 432 /* Normal Zip/LS-120 disks */ 432 433 if (memcmp(cap_desc, &floppy->cap_desc, 8))

-4

drivers/ide/ide-io.c

··· 460 460 struct ide_host *host = hwif->host; 461 461 struct request *rq = NULL; 462 462 ide_startstop_t startstop; 463 - unsigned long queue_run_ms = 3; /* old plug delay */ 464 463 465 464 spin_unlock_irq(q->queue_lock); 466 465 ··· 479 480 prev_port = hwif->host->cur_port; 480 481 if (drive->dev_flags & IDE_DFLAG_SLEEPING && 481 482 time_after(drive->sleep, jiffies)) { 482 - unsigned long left = jiffies - drive->sleep; 483 - 484 - queue_run_ms = jiffies_to_msecs(left + 1); 485 483 ide_unlock_port(hwif); 486 484 goto plug_device; 487 485 }

drivers/ide/ide-probe.c

··· 142 142 } 143 143 /* Early cdrom models used zero */ 144 144 type = ide_cdrom; 145 + /* fall through */ 145 146 case ide_cdrom: 146 147 drive->dev_flags |= IDE_DFLAG_REMOVABLE; 147 148 #ifdef CONFIG_PPC

-2

drivers/ide/ide-tape.c

··· 1746 1746 { 1747 1747 unsigned long t; 1748 1748 int speed; 1749 - int buffer_size; 1750 1749 u16 *ctl = (u16 *)&tape->caps[12]; 1751 1750 1752 1751 ide_debug_log(IDE_DBG_FUNC, "minor: %d", minor); ··· 1780 1781 *ctl /= 2; 1781 1782 tape->buffer_size = *ctl * tape->blk_size; 1782 1783 } 1783 - buffer_size = tape->buffer_size; 1784 1784 1785 1785 /* select the "best" DSC read/write polling freq */ 1786 1786 speed = max(*(u16 *)&tape->caps[14], *(u16 *)&tape->caps[8]);

+2 -1

drivers/ide/ide-taskfile.c

··· 128 128 return pre_task_out_intr(drive, cmd); 129 129 } 130 130 handler = task_pio_intr; 131 - /* fall-through */ 131 + /* fall through */ 132 132 case ATA_PROT_NODATA: 133 133 if (handler == NULL) 134 134 handler = task_no_data_intr; ··· 140 140 hwif->expiry = dma_ops->dma_timer_expiry; 141 141 ide_execute_command(drive, cmd, ide_dma_intr, 2 * WAIT_CMD); 142 142 dma_ops->dma_start(drive); 143 + /* fall through */ 143 144 default: 144 145 return ide_started; 145 146 }

drivers/ide/sis5513.c

··· 494 494 pci_read_config_byte(dev, 0x09, &reg); 495 495 if ((reg & 0x0f) != 0x00) 496 496 pci_write_config_byte(dev, 0x09, reg&0xf0); 497 + /* fall through */ 497 498 case ATA_16: 498 499 /* force per drive recovery and active timings 499 500 needed on ATA_33 and below chips */