Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide (bc119dd9) · Commits · 戴 / test

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

drivers/ide/hpt366.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -574,7 +574,7 @@ 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 */
		/* fall through */
		case HPT372 :
		case HPT372A:
		case HPT372N:
		@@ -601,7 +601,7 @@ static u8 hpt3xx_mdma_filter(ide_drive_t *drive)
		case HPT374 :
		if (ata_id_is_sata(drive->id))
		return 0x00;
		/* else: fall through */
		/* fall through */
		default:
		return 0x07;
		}

drivers/ide/ide-floppy.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -427,7 +427,7 @@ static int ide_floppy_get_capacity(ide_drive_t *drive)
		* (maintains previous driver behaviour)
		*/
		break;
		/* else: fall through */
		/* fall through */
		case CAPACITY_CURRENT:
		/* Normal Zip/LS-120 disks */
		if (memcmp(cap_desc, &floppy->cap_desc, 8))

drivers/ide/Kconfig

+13 −13

File changed.

Contains only whitespace changes.

Admin message