tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds bc119dd9 8f49a658

+16 -16
+13 -13
drivers/ide/Kconfig
··· 320 320 config BLK_DEV_GENERIC 321 321 tristate "Generic PCI IDE Chipset Support" 322 322 select BLK_DEV_IDEPCI 323 - help 324 - This option provides generic support for various PCI IDE Chipsets 325 - which otherwise might not be supported. 323 + help 324 + This option provides generic support for various PCI IDE Chipsets 325 + which otherwise might not be supported. 326 326 327 327 config BLK_DEV_OPTI621 328 328 tristate "OPTi 82C621 chipset enhanced support" ··· 516 516 tristate "IT8213 IDE support" 517 517 select BLK_DEV_IDEDMA_PCI 518 518 help 519 - This driver adds support for the ITE 8213 IDE controller. 519 + This driver adds support for the ITE 8213 IDE controller. 520 520 521 521 config BLK_DEV_IT821X 522 522 tristate "IT821X IDE support" ··· 671 671 hard disk and hdc for CD-ROM. 672 672 673 673 config BLK_DEV_IDE_AU1XXX 674 - bool "IDE for AMD Alchemy Au1200" 675 - depends on MIPS_ALCHEMY 676 - select IDE_XFER_MODE 674 + bool "IDE for AMD Alchemy Au1200" 675 + depends on MIPS_ALCHEMY 676 + select IDE_XFER_MODE 677 677 choice 678 - prompt "IDE Mode for AMD Alchemy Au1200" 679 - default BLK_DEV_IDE_AU1XXX_PIO_DBDMA 680 - depends on BLK_DEV_IDE_AU1XXX 678 + prompt "IDE Mode for AMD Alchemy Au1200" 679 + default BLK_DEV_IDE_AU1XXX_PIO_DBDMA 680 + depends on BLK_DEV_IDE_AU1XXX 681 681 682 682 config BLK_DEV_IDE_AU1XXX_PIO_DBDMA 683 - bool "PIO+DbDMA IDE for AMD Alchemy Au1200" 683 + bool "PIO+DbDMA IDE for AMD Alchemy Au1200" 684 684 685 685 config BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA 686 - bool "MDMA2+DbDMA IDE for AMD Alchemy Au1200" 687 - depends on BLK_DEV_IDE_AU1XXX 686 + bool "MDMA2+DbDMA IDE for AMD Alchemy Au1200" 687 + depends on BLK_DEV_IDE_AU1XXX 688 688 endchoice 689 689 690 690 config BLK_DEV_IDE_TX4938
+2 -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 + /* fall through */ 578 578 case HPT372 : 579 579 case HPT372A: 580 580 case HPT372N: ··· 601 601 case HPT374 : 602 602 if (ata_id_is_sata(drive->id)) 603 603 return 0x00; 604 - /* else: fall through */ 604 + /* fall through */ 605 605 default: 606 606 return 0x07; 607 607 }
+1 -1
drivers/ide/ide-floppy.c
··· 427 427 * (maintains previous driver behaviour) 428 428 */ 429 429 break; 430 - /* else: fall through */ 430 + /* fall through */ 431 431 case CAPACITY_CURRENT: 432 432 /* Normal Zip/LS-120 disks */ 433 433 if (memcmp(cap_desc, &floppy->cap_desc, 8))