Commit bc119dd9 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 8f49a658 dc5c3773
...@@ -320,9 +320,9 @@ config BLK_DEV_OFFBOARD ...@@ -320,9 +320,9 @@ config BLK_DEV_OFFBOARD
config BLK_DEV_GENERIC config BLK_DEV_GENERIC
tristate "Generic PCI IDE Chipset Support" tristate "Generic PCI IDE Chipset Support"
select BLK_DEV_IDEPCI select BLK_DEV_IDEPCI
help help
This option provides generic support for various PCI IDE Chipsets This option provides generic support for various PCI IDE Chipsets
which otherwise might not be supported. which otherwise might not be supported.
config BLK_DEV_OPTI621 config BLK_DEV_OPTI621
tristate "OPTi 82C621 chipset enhanced support" tristate "OPTi 82C621 chipset enhanced support"
...@@ -516,7 +516,7 @@ config BLK_DEV_IT8213 ...@@ -516,7 +516,7 @@ config BLK_DEV_IT8213
tristate "IT8213 IDE support" tristate "IT8213 IDE support"
select BLK_DEV_IDEDMA_PCI select BLK_DEV_IDEDMA_PCI
help help
This driver adds support for the ITE 8213 IDE controller. This driver adds support for the ITE 8213 IDE controller.
config BLK_DEV_IT821X config BLK_DEV_IT821X
tristate "IT821X IDE support" tristate "IT821X IDE support"
...@@ -671,20 +671,20 @@ config BLK_DEV_IDE_PMAC_ATA100FIRST ...@@ -671,20 +671,20 @@ config BLK_DEV_IDE_PMAC_ATA100FIRST
hard disk and hdc for CD-ROM. hard disk and hdc for CD-ROM.
config BLK_DEV_IDE_AU1XXX config BLK_DEV_IDE_AU1XXX
bool "IDE for AMD Alchemy Au1200" bool "IDE for AMD Alchemy Au1200"
depends on MIPS_ALCHEMY depends on MIPS_ALCHEMY
select IDE_XFER_MODE select IDE_XFER_MODE
choice choice
prompt "IDE Mode for AMD Alchemy Au1200" prompt "IDE Mode for AMD Alchemy Au1200"
default BLK_DEV_IDE_AU1XXX_PIO_DBDMA default BLK_DEV_IDE_AU1XXX_PIO_DBDMA
depends on BLK_DEV_IDE_AU1XXX depends on BLK_DEV_IDE_AU1XXX
config BLK_DEV_IDE_AU1XXX_PIO_DBDMA config BLK_DEV_IDE_AU1XXX_PIO_DBDMA
bool "PIO+DbDMA IDE for AMD Alchemy Au1200" bool "PIO+DbDMA IDE for AMD Alchemy Au1200"
config BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA config BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
bool "MDMA2+DbDMA IDE for AMD Alchemy Au1200" bool "MDMA2+DbDMA IDE for AMD Alchemy Au1200"
depends on BLK_DEV_IDE_AU1XXX depends on BLK_DEV_IDE_AU1XXX
endchoice endchoice
config BLK_DEV_IDE_TX4938 config BLK_DEV_IDE_TX4938
......
...@@ -574,7 +574,7 @@ static u8 hpt3xx_udma_filter(ide_drive_t *drive) ...@@ -574,7 +574,7 @@ static u8 hpt3xx_udma_filter(ide_drive_t *drive)
if (!HPT370_ALLOW_ATA100_5 || if (!HPT370_ALLOW_ATA100_5 ||
check_in_drive_list(drive, bad_ata100_5)) check_in_drive_list(drive, bad_ata100_5))
return ATA_UDMA4; return ATA_UDMA4;
/* else: fall through */ /* fall through */
case HPT372 : case HPT372 :
case HPT372A: case HPT372A:
case HPT372N: case HPT372N:
...@@ -601,7 +601,7 @@ static u8 hpt3xx_mdma_filter(ide_drive_t *drive) ...@@ -601,7 +601,7 @@ static u8 hpt3xx_mdma_filter(ide_drive_t *drive)
case HPT374 : case HPT374 :
if (ata_id_is_sata(drive->id)) if (ata_id_is_sata(drive->id))
return 0x00; return 0x00;
/* else: fall through */ /* fall through */
default: default:
return 0x07; return 0x07;
} }
......
...@@ -427,7 +427,7 @@ static int ide_floppy_get_capacity(ide_drive_t *drive) ...@@ -427,7 +427,7 @@ static int ide_floppy_get_capacity(ide_drive_t *drive)
* (maintains previous driver behaviour) * (maintains previous driver behaviour)
*/ */
break; break;
/* else: fall through */ /* fall through */
case CAPACITY_CURRENT: case CAPACITY_CURRENT:
/* Normal Zip/LS-120 disks */ /* Normal Zip/LS-120 disks */
if (memcmp(cap_desc, &floppy->cap_desc, 8)) if (memcmp(cap_desc, &floppy->cap_desc, 8))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment