mirror of https://gitee.com/openkylin/linux.git
ide: mark expected switch fall-throughs
In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through. Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
777a82f87a
commit
a2eed33dcd
|
@ -574,13 +574,14 @@ static u8 hpt3xx_udma_filter(ide_drive_t *drive)
|
|||
if (!HPT370_ALLOW_ATA100_5 ||
|
||||
check_in_drive_list(drive, bad_ata100_5))
|
||||
return ATA_UDMA4;
|
||||
/* else: fall through */
|
||||
case HPT372 :
|
||||
case HPT372A:
|
||||
case HPT372N:
|
||||
case HPT374 :
|
||||
if (ata_id_is_sata(drive->id))
|
||||
mask &= ~0x0e;
|
||||
/* Fall thru */
|
||||
/* fall through */
|
||||
default:
|
||||
return mask;
|
||||
}
|
||||
|
@ -600,7 +601,7 @@ static u8 hpt3xx_mdma_filter(ide_drive_t *drive)
|
|||
case HPT374 :
|
||||
if (ata_id_is_sata(drive->id))
|
||||
return 0x00;
|
||||
/* Fall thru */
|
||||
/* else: fall through */
|
||||
default:
|
||||
return 0x07;
|
||||
}
|
||||
|
|
|
@ -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))
|
||||
|
|
|
@ -142,6 +142,7 @@ static void ide_classify_atapi_dev(ide_drive_t *drive)
|
|||
}
|
||||
/* Early cdrom models used zero */
|
||||
type = ide_cdrom;
|
||||
/* fall through */
|
||||
case ide_cdrom:
|
||||
drive->dev_flags |= IDE_DFLAG_REMOVABLE;
|
||||
#ifdef CONFIG_PPC
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -494,6 +494,7 @@ static int init_chipset_sis5513(struct pci_dev *dev)
|
|||
pci_read_config_byte(dev, 0x09, ®);
|
||||
if ((reg & 0x0f) != 0x00)
|
||||
pci_write_config_byte(dev, 0x09, reg&0xf0);
|
||||
/* fall through */
|
||||
case ATA_16:
|
||||
/* force per drive recovery and active timings
|
||||
needed on ATA_33 and below chips */
|
||||
|
|
Loading…
Reference in New Issue