IDE fixes
The final polishing touch for 2.6.27...
[ Swarm commit outstands in diffstat but is a straightforward change. ]
Linus, please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git/
to receive the following updates:
arch/mips/sibyte/swarm/Makefile | 3 +- arch/mips/sibyte/swarm/platform.c | 81 +++++++++++++++ drivers/ide/Kconfig | 4 - drivers/ide/ide-cd.c | 6 +- drivers/ide/ide-dma.c | 2 +- drivers/ide/ide-probe.c | 2 +- drivers/ide/mips/Makefile | 1 - drivers/ide/mips/swarm.c | 197 ------------------------------------- include/linux/ide.h | 4 +- 9 files changed, 93 insertions(+), 207 deletions(-) create mode 100644 arch/mips/sibyte/swarm/platform.c delete mode 100644 drivers/ide/mips/swarm.c
Bartlomiej Zolnierkiewicz (1):
ide: workaround for bogus gcc warning in ide_sysfs_register_port()
Bodo Eggert (1):
ide-cd: Optiarc DVD RW AD-7200A does play audio
Borislav Petkov (1):
ide-cd: temporary tray close fix
Ralf Baechle (1):
IDE: Fix platform device registration in Swarm IDE driver (v2)
Sergei Shtylylov (1):
ide-dma: fix ide_build_dmatable() for TRM290
arch/mips/sibyte/swarm/Makefile +2 -1
@@ -1,3 +1,4 @@ -obj-y := setup.o rtc_xicor1241.o rtc_m41t81.o +obj-y := platform.o setup.o rtc_xicor1241.o \ + rtc_m41t81.o obj-$(CONFIG_I2C_BOARDINFO) += swarm-i2c.o
arch/mips/sibyte/swarm/platform.c new file +81 -0
81 lines not on this page · raw message
drivers/ide/Kconfig +0 -4
@@ -780,10 +780,6 @@ config BLK_DEV_IDEDMA_PMAC to transfer data to and from memory. Saying Y is safe and improves performance. -config BLK_DEV_IDE_SWARM - tristate "IDE for Sibyte evaluation boards" - depends on SIBYTE_SB1xxx_SOC - config BLK_DEV_IDE_AU1XXX bool "IDE for AMD Alchemy Au1200" depends on SOC_AU1200
drivers/ide/ide-cd.c +5 -1
@@ -1661,7 +1661,9 @@ static int ide_cdrom_probe_capabilities(ide_drive_t *drive) cdi->mask &= ~CDC_PLAY_AUDIO ; mechtype = buf[8 +6 ] >>5 ; -if (mechtype == mechtype_caddy || mechtype == mechtype_popup) +if (mechtype == mechtype_caddy || + mechtype == mechtype_popup || + (drive->atapi_flags &IDE_AFLAG_NO_AUTOCLOSE )) cdi->mask |=CDC_CLOSE_TRAY ;if (cdi->sanyo_slot >0 ) {
@@ -1859,6 +1861,8 @@ static const struct cd_list_entry ide_cd_quirks_list[] = { { "MATSHITADVD-ROM SR-8176", NULL, IDE_AFLAG_PLAY_AUDIO_OK }, { "MATSHITADVD-ROM SR-8174", NULL, IDE_AFLAG_PLAY_AUDIO_OK }, { "Optiarc DVD RW AD-5200A", NULL, IDE_AFLAG_PLAY_AUDIO_OK }, + { "Optiarc DVD RW AD-7200A", NULL, IDE_AFLAG_PLAY_AUDIO_OK }, + { "Optiarc DVD RW AD-7543A", NULL, IDE_AFLAG_NO_AUTOCLOSE }, { NULL, NULL, 0 } };
drivers/ide/ide-dma.c +1 -1
@@ -211,7 +211,7 @@ int ide_build_dmatable (ide_drive_t *drive, struct request *rq) xcount = bcount &0xffff ;if (is_trm290) xcount = ((xcount >>2 ) -1 ) <<16 ; -if (xcount ==0x0000 ) { +else if (xcount ==0x0000 ) {/* * Most chipsets correctly interpret a length of 0x0000 as 64KB, * but at least one (e.g. CS5530) misinterprets it as zero (!).
drivers/ide/ide-probe.c +1 -1
@@ -1492,7 +1492,7 @@ static struct device_attribute *ide_port_attrs[] = {static int ide_sysfs_register_port (ide_hwif_t *hwif) { -int i, rc; +int i,uninitialized_var (rc );for (i =0 ; ide_port_attrs[i]; i++) { rc =device_create_file (hwif->portdev, ide_port_attrs[i]);
drivers/ide/mips/Makefile +0 -1
@@ -1,4 +1,3 @@ -obj-$(CONFIG_BLK_DEV_IDE_SWARM) += swarm.o obj-$(CONFIG_BLK_DEV_IDE_AU1XXX) += au1xxx-ide.o EXTRA_CFLAGS := -Idrivers/ide
drivers/ide/mips/swarm.c deleted +0 -197
197 lines not on this page · raw message
include/linux/ide.h +3 -1
@@ -366,7 +366,9 @@ enum {/* Currently on a filemark */ IDE_AFLAG_FILEMARK = (1 <<25 ),/* 0 = no tape is loaded, so we don't rewind after ejecting */ -IDE_AFLAG_MEDIUM_PRESENT = (1 <<26 ) +IDE_AFLAG_MEDIUM_PRESENT = (1 <<26 ), + + IDE_AFLAG_NO_AUTOCLOSE = (1 << 27), }; struct ide_drive_s {