bk://bart.bkbits.net/ide-dev-2.6
bzolnier@trik.(none)|ChangeSet|20041102131855|44292 bzolnier

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/11/28 22:32:05-08:00 akpm@bix.(none) 
#   Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-ide-dev
# 
# drivers/ide/arm/icside.c
#   2004/11/28 22:32:01-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/11/17 20:03:29-08:00 akpm@bix.(none) 
#   Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-ide-dev
# 
# drivers/ide/ide.c
#   2004/11/17 20:03:25-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# drivers/ide/ide-proc.c
#   2004/11/17 20:03:25-08:00 akpm@bix.(none) +1 -0
#   Auto merged
# 
# drivers/ide/ide-probe.c
#   2004/11/17 20:03:25-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# drivers/ide/ide-disk.c
#   2004/11/17 20:03:25-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/11/14 21:40:25-08:00 akpm@bix.(none) 
#   Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-ide-dev
# 
# drivers/ide/arm/icside.c
#   2004/11/14 21:40:21-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/11/13 15:21:15-08:00 akpm@bix.(none) 
#   Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-ide-dev
# 
# drivers/ide/ide.c
#   2004/11/13 15:21:11-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/11/11 15:23:33-08:00 akpm@bix.(none) 
#   Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-ide-dev
# 
# drivers/ide/ide.c
#   2004/11/11 15:23:30-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/11/10 12:20:37-08:00 akpm@bix.(none) 
#   Merge bk://bart.bkbits.net/ide-dev-2.6
#   into bix.(none):/usr/src/bk-ide-dev
# 
# include/linux/ide.h
#   2004/11/10 12:20:33-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# drivers/ide/ide-taskfile.c
#   2004/11/10 12:20:33-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/11/05 20:50:54-08:00 akpm@bix.(none) 
#   Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-ide-dev
# 
# include/linux/ide.h
#   2004/11/05 20:50:50-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# include/linux/hdreg.h
#   2004/11/05 20:50:50-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# drivers/ide/setup-pci.c
#   2004/11/05 20:50:50-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# drivers/ide/ide.c
#   2004/11/05 20:50:49-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# drivers/ide/ide-probe.c
#   2004/11/05 20:50:49-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/11/02 14:18:55+01:00 bzolnier@trik.(none) 
#   hch noticed that some "/ SECTOR_SIZE" are missing
#   
#   Cset exclude: bzolnier@trik.(none)|ChangeSet|20041029193506|44339
# 
# include/linux/ide.h
#   2004/11/02 14:18:45+01:00 bzolnier@trik.(none) +0 -0
#   Exclude
# 
# drivers/ide/ide-taskfile.c
#   2004/11/02 14:18:44+01:00 bzolnier@trik.(none) +0 -0
#   Exclude
# 
# drivers/ide/ide-disk.c
#   2004/11/02 14:18:44+01:00 bzolnier@trik.(none) +0 -0
#   Exclude
# 
# ChangeSet
#   2004/11/01 13:11:37-08:00 akpm@bix.(none) 
#   Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-ide-dev
# 
# include/linux/ide.h
#   2004/11/01 13:11:33-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# drivers/ide/setup-pci.c
#   2004/11/01 13:11:33-08:00 akpm@bix.(none) +0 -5
#   Auto merged
# 
# drivers/ide/ide.c
#   2004/11/01 13:11:33-08:00 akpm@bix.(none) +0 -12
#   Auto merged
# 
# drivers/ide/ide-taskfile.c
#   2004/11/01 13:11:33-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# drivers/ide/ide-proc.c
#   2004/11/01 13:11:33-08:00 akpm@bix.(none) +0 -6
#   Auto merged
# 
# drivers/ide/arm/icside.c
#   2004/11/01 13:11:33-08:00 akpm@bix.(none) +0 -5
#   Auto merged
# 
# ChangeSet
#   2004/10/29 16:41:54-07:00 akpm@bix.(none) 
#   Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-ide-dev
# 
# drivers/ide/arm/icside.c
#   2004/10/29 16:41:49-07:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/10/29 21:24:49+02:00 bzolnier@trik.(none) 
#   [ide] obsolete "enable DMA by default" config options
#   
#   CONFIG_IDEDMA_PCI_AUTO and CONFIG_IDEDMA_ICS_AUTO
#   
#   Host drivers should deal with broken hardware themselves.
#   Warn if DMA support is enabled but "enable DMA by default" is not.
# 
# drivers/ide/setup-pci.c
#   2004/10/29 21:24:27+02:00 bzolnier@trik.(none) +5 -0
#   [ide] obsolete "enable DMA by default" config options
# 
# drivers/ide/arm/icside.c
#   2004/10/29 21:24:27+02:00 bzolnier@trik.(none) +5 -0
#   [ide] obsolete "enable DMA by default" config options
# 
# ChangeSet
#   2004/10/29 21:14:36+02:00 bzolnier@trik.(none) 
#   [ide] obsolete some command line parameters
#   
#   "hdx=autotune", "hdx=noautotune":
#   * should be handled by host drivers needing them
#   
#   "idex=autotune", "idex=noautotune":
#   * should die
#   
#   "idex=ata66":
#   * should be handled by host drivers needing it
#   
#   "idex=dma":
#   * works only for: cs5220.c, generic.c, hpt366.c, triflex.c
#   * DMA should be used by default
#   
#   "idex=reset", "idex=serialize":
#   * host drivers should set these settings when needed
#   
#   "idex=base[,ctl[,irq]]":
#   * host drivers should auto-detect correct settings
#   * ordering should be controlled by user-space
#   
#   "ide0=four":
#   * should be handled by ide-generic driver
# 
# drivers/ide/ide.c
#   2004/10/29 21:14:15+02:00 bzolnier@trik.(none) +12 -9
#   [ide] obsolete some command line parameters
# 
# ChangeSet
#   2004/10/29 20:59:23+02:00 bzolnier@trik.(none) 
#   [ide] ignore BIOS enable bits for Promise controllers
#   
#   There are no Promise binary drivers for 2.6.x kernels so:
#   * ignore BIOS enable bits completely
#   * remove CONFIG_PDC202XX_FORCE
#   * kill IDEPCI_FLAG_FORCE_PDC hack
# 
# include/linux/ide.h
#   2004/10/29 20:15:33+02:00 bzolnier@trik.(none) +0 -1
#   [ide] ignore BIOS enable bits for Promise controllers
# 
# drivers/ide/setup-pci.c
#   2004/10/29 20:15:33+02:00 bzolnier@trik.(none) +1 -14
#   [ide] ignore BIOS enable bits for Promise controllers
# 
# drivers/ide/pci/pdc202xx_old.h
#   2004/10/29 20:15:33+02:00 bzolnier@trik.(none) +0 -17
#   [ide] ignore BIOS enable bits for Promise controllers
# 
# drivers/ide/pci/pdc202xx_new.h
#   2004/10/29 20:15:33+02:00 bzolnier@trik.(none) +0 -6
#   [ide] ignore BIOS enable bits for Promise controllers
# 
# drivers/ide/Kconfig
#   2004/10/29 20:15:33+02:00 bzolnier@trik.(none) +0 -7
#   [ide] ignore BIOS enable bits for Promise controllers
# 
# ChangeSet
#   2004/10/29 20:58:09+02:00 bzolnier@trik.(none) 
#   [ide] obsolete /proc/ide/hd?/settings
#   
#   Majority of these settings is also available through ioctls.
#   We will deal with the rest during deprecation period.
# 
# drivers/ide/ide-proc.c
#   2004/10/29 20:57:48+02:00 bzolnier@trik.(none) +6 -0
#   [ide] obsolete /proc/ide/hd?/settings
# 
# ChangeSet
#   2004/10/29 20:54:32+02:00 bzolnier@trik.(none) 
#   [ide] kill /proc/ide/hd?/settings:number
#   
#   drive->dn is used mainly for programming timings and shouldn't be touched.
# 
# drivers/ide/ide.c
#   2004/10/29 20:54:13+02:00 bzolnier@trik.(none) +0 -1
#   [ide] kill /proc/ide/hd?/settings:number
# 
# ChangeSet
#   2004/10/29 20:52:26+02:00 bzolnier@trik.(none) 
#   [ide] kill /proc/ide/hd?/settings:lun
#   
#   drive->lun is always zero in init_gendisk().
# 
# include/linux/ide.h
#   2004/10/29 20:52:03+02:00 bzolnier@trik.(none) +0 -1
#   [ide] kill /proc/ide/hd?/settings:lun
# 
# drivers/ide/ide-probe.c
#   2004/10/29 20:52:03+02:00 bzolnier@trik.(none) +2 -2
#   [ide] kill /proc/ide/hd?/settings:lun
# 
# drivers/ide/ide-disk.c
#   2004/10/29 20:52:03+02:00 bzolnier@trik.(none) +0 -1
#   [ide] kill /proc/ide/hd?/settings:lun
# 
# ChangeSet
#   2004/10/29 20:47:43+02:00 bzolnier@trik.(none) 
#   [ide] kill /proc/ide/hd?/settings:address & HDIO_[GET,SET]_ADDRESS ioctls
#   
#   ide-disk driver always uses LBA48 when available so
#   messing with drive->addressing should be prohibited.
# 
# include/linux/hdreg.h
#   2004/10/29 20:47:24+02:00 bzolnier@trik.(none) +4 -2
#   [ide] kill /proc/ide/hd?/settings:address & HDIO_[GET,SET]_ADDRESS ioctls
# 
# drivers/ide/ide-disk.c
#   2004/10/29 20:47:24+02:00 bzolnier@trik.(none) +0 -1
#   [ide] kill /proc/ide/hd?/settings:address & HDIO_[GET,SET]_ADDRESS ioctls
# 
# ChangeSet
#   2004/10/29 20:43:49+02:00 bzolnier@trik.(none) 
#   [ide] triflex: simplify triflex_config_drive_for_dma()
# 
# drivers/ide/pci/triflex.c
#   2004/10/29 20:43:28+02:00 bzolnier@trik.(none) +3 -5
#   [ide] triflex: simplify triflex_config_drive_for_dma()
# 
# ChangeSet
#   2004/10/29 20:41:24+02:00 bzolnier@trik.(none) 
#   [ide] atiixp: simplify atiixp_config_drive_for_dma()
# 
# drivers/ide/pci/atiixp.c
#   2004/10/29 20:40:59+02:00 bzolnier@trik.(none) +2 -4
#   [ide] atiixp: simplify atiixp_config_drive_for_dma()
# 
diff -Nru a/drivers/ide/Kconfig b/drivers/ide/Kconfig
--- a/drivers/ide/Kconfig	2004-12-12 18:18:05 -08:00
+++ b/drivers/ide/Kconfig	2004-12-12 18:18:05 -08:00
@@ -659,13 +659,6 @@
 config BLK_DEV_PDC202XX_NEW
 	tristate "PROMISE PDC202{68|69|70|71|75|76|77} support"
 
-# FIXME - probably wants to be one for old and for new
-config PDC202XX_FORCE
-	bool "Enable controller even if disabled by BIOS"
-	depends on BLK_DEV_PDC202XX_NEW
-	help
-	  Enable the PDC202xx controller even if it has been disabled in the BIOS setup.
-
 config BLK_DEV_SVWKS
 	tristate "ServerWorks OSB4/CSB5/CSB6 chipsets support"
 	help
diff -Nru a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
--- a/drivers/ide/ide-disk.c	2004-12-12 18:18:05 -08:00
+++ b/drivers/ide/ide-disk.c	2004-12-12 18:18:05 -08:00
@@ -1027,11 +1027,9 @@
 	ide_add_setting(drive,	"bios_cyl",		SETTING_RW,					-1,			-1,			TYPE_INT,	0,	65535,				1,	1,	&drive->bios_cyl,		NULL);
 	ide_add_setting(drive,	"bios_head",		SETTING_RW,					-1,			-1,			TYPE_BYTE,	0,	255,				1,	1,	&drive->bios_head,		NULL);
 	ide_add_setting(drive,	"bios_sect",		SETTING_RW,					-1,			-1,			TYPE_BYTE,	0,	63,				1,	1,	&drive->bios_sect,		NULL);
-	ide_add_setting(drive,	"address",		SETTING_RW,					HDIO_GET_ADDRESS,	HDIO_SET_ADDRESS,	TYPE_INTA,	0,	2,				1,	1,	&drive->addressing,	set_lba_addressing);
 	ide_add_setting(drive,	"bswap",		SETTING_READ,					-1,			-1,			TYPE_BYTE,	0,	1,				1,	1,	&drive->bswap,			NULL);
 	ide_add_setting(drive,	"multcount",		id ? SETTING_RW : SETTING_READ,			HDIO_GET_MULTCOUNT,	HDIO_SET_MULTCOUNT,	TYPE_BYTE,	0,	id ? id->max_multsect : 0,	1,	1,	&drive->mult_count,		set_multcount);
 	ide_add_setting(drive,	"nowerr",		SETTING_RW,					HDIO_GET_NOWERR,	HDIO_SET_NOWERR,	TYPE_BYTE,	0,	1,				1,	1,	&drive->nowerr,			set_nowerr);
-	ide_add_setting(drive,	"lun",			SETTING_RW,					-1,			-1,			TYPE_INT,	0,	7,				1,	1,	&drive->lun,			NULL);
 	ide_add_setting(drive,	"wcache",		SETTING_RW,					HDIO_GET_WCACHE,	HDIO_SET_WCACHE,	TYPE_BYTE,	0,	1,				1,	1,	&drive->wcache,			write_cache);
 	ide_add_setting(drive,	"acoustic",		SETTING_RW,					HDIO_GET_ACOUSTIC,	HDIO_SET_ACOUSTIC,	TYPE_BYTE,	0,	254,				1,	1,	&drive->acoustic,		set_acoustic);
  	ide_add_setting(drive,	"failures",		SETTING_RW,					-1,			-1,			TYPE_INT,	0,	65535,				1,	1,	&drive->failures,		NULL);
diff -Nru a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
--- a/drivers/ide/ide-probe.c	2004-12-12 18:18:05 -08:00
+++ b/drivers/ide/ide-probe.c	2004-12-12 18:18:05 -08:00
@@ -1230,10 +1230,10 @@
 		drive->gendev.release = drive_release_dev;
 		if (drive->present) {
 			device_register(&drive->gendev);
-			sprintf(drive->devfs_name, "ide/host%d/bus%d/target%d/lun%d",
+			sprintf(drive->devfs_name, "ide/host%d/bus%d/target%d/lun0",
 				(hwif->channel && hwif->mate) ?
 				hwif->mate->index : hwif->index,
-				hwif->channel, unit, drive->lun);
+				hwif->channel, unit);
 		}
 	}
 	blk_register_region(MKDEV(hwif->major, 0), MAX_DRIVES << PARTN_BITS,
diff -Nru a/drivers/ide/ide.c b/drivers/ide/ide.c
--- a/drivers/ide/ide.c	2004-12-12 18:18:05 -08:00
+++ b/drivers/ide/ide.c	2004-12-12 18:18:05 -08:00
@@ -1427,7 +1427,6 @@
 	ide_add_setting(drive,	"using_dma",		SETTING_RW,					HDIO_GET_DMA,		HDIO_SET_DMA,		TYPE_BYTE,	0,	1,				1,		1,		&drive->using_dma,		set_using_dma);
 	ide_add_setting(drive,	"init_speed",		SETTING_RW,					-1,			-1,			TYPE_BYTE,	0,	70,				1,		1,		&drive->init_speed,		NULL);
 	ide_add_setting(drive,	"current_speed",	SETTING_RW,					-1,			-1,			TYPE_BYTE,	0,	70,				1,		1,		&drive->current_speed,		set_xfer_rate);
-	ide_add_setting(drive,	"number",		SETTING_RW,					-1,			-1,			TYPE_BYTE,	0,	3,				1,		1,		&drive->dn,			NULL);
 }
 
 /**
diff -Nru a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c
--- a/drivers/ide/pci/atiixp.c	2004-12-12 18:18:05 -08:00
+++ b/drivers/ide/pci/atiixp.c	2004-12-12 18:18:05 -08:00
@@ -235,10 +235,8 @@
 	u8 speed = ide_dma_speed(drive, atiixp_ratemask(drive));
 
 	/* If no DMA speed was available then disable DMA and use PIO. */
-	if (!speed) {
-		u8 tspeed = ide_get_best_pio_mode(drive, 255, 5, NULL);
-		speed = atiixp_dma_2_pio(XFER_PIO_0 + tspeed) + XFER_PIO_0;
-	}
+	if (!speed)
+		return 0;
 
 	(void) atiixp_speedproc(drive, speed);
 	return ide_dma_enable(drive);
diff -Nru a/drivers/ide/pci/pdc202xx_new.h b/drivers/ide/pci/pdc202xx_new.h
--- a/drivers/ide/pci/pdc202xx_new.h	2004-12-12 18:18:05 -08:00
+++ b/drivers/ide/pci/pdc202xx_new.h	2004-12-12 18:18:05 -08:00
@@ -73,9 +73,6 @@
 		.init_hwif	= init_hwif_pdc202new,
 		.channels	= 2,
 		.autodma	= AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
-		.enablebits	= {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
 		.bootable	= OFF_BOARD,
 	},{	/* 3 */
 		.name		= "PDC20271",
@@ -100,9 +97,6 @@
 		.init_hwif	= init_hwif_pdc202new,
 		.channels	= 2,
 		.autodma	= AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
-		.enablebits	= {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
 		.bootable	= OFF_BOARD,
 	},{	/* 6 */
 		.name		= "PDC20277",
diff -Nru a/drivers/ide/pci/pdc202xx_old.h b/drivers/ide/pci/pdc202xx_old.h
--- a/drivers/ide/pci/pdc202xx_old.h	2004-12-12 18:18:05 -08:00
+++ b/drivers/ide/pci/pdc202xx_old.h	2004-12-12 18:18:05 -08:00
@@ -79,9 +79,6 @@
 		.init_dma	= init_dma_pdc202xx,
 		.channels	= 2,
 		.autodma	= AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
-		.enablebits	= {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
 		.bootable	= OFF_BOARD,
 		.extra		= 16,
 	},{	/* 1 */
@@ -92,12 +89,8 @@
 		.init_dma	= init_dma_pdc202xx,
 		.channels	= 2,
 		.autodma	= AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
-		.enablebits	= {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
 		.bootable	= OFF_BOARD,
 		.extra		= 48,
-		.flags		= IDEPCI_FLAG_FORCE_PDC,
 	},{	/* 2 */
 		.name		= "PDC20263",
 		.init_setup	= init_setup_pdc202ata4,
@@ -106,9 +99,6 @@
 		.init_dma	= init_dma_pdc202xx,
 		.channels	= 2,
 		.autodma	= AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
-		.enablebits	= {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
 		.bootable	= OFF_BOARD,
 		.extra		= 48,
 	},{	/* 3 */
@@ -119,12 +109,8 @@
 		.init_dma	= init_dma_pdc202xx,
 		.channels	= 2,
 		.autodma	= AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
-		.enablebits	= {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
 		.bootable	= OFF_BOARD,
 		.extra		= 48,
-		.flags		= IDEPCI_FLAG_FORCE_PDC,
 	},{	/* 4 */
 		.name		= "PDC20267",
 		.init_setup	= init_setup_pdc202xx,
@@ -133,9 +119,6 @@
 		.init_dma	= init_dma_pdc202xx,
 		.channels	= 2,
 		.autodma	= AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
-		.enablebits	= {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
 		.bootable	= OFF_BOARD,
 		.extra		= 48,
 	}
diff -Nru a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c
--- a/drivers/ide/pci/triflex.c	2004-12-12 18:18:05 -08:00
+++ b/drivers/ide/pci/triflex.c	2004-12-12 18:18:05 -08:00
@@ -105,11 +105,9 @@
 {
 	int speed = ide_dma_speed(drive, 0); /* No ultra speeds */
 
-	if (!speed) { 
-		u8 pspeed = ide_get_best_pio_mode(drive, 255, 4, NULL);
-		speed = XFER_PIO_0 + pspeed;
-	}
-	
+	if (!speed)
+		return 0;
+
 	(void) triflex_tune_chipset(drive, speed);
 	 return ide_dma_enable(drive);
 }
diff -Nru a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
--- a/drivers/ide/setup-pci.c	2004-12-12 18:18:05 -08:00
+++ b/drivers/ide/setup-pci.c	2004-12-12 18:18:05 -08:00
@@ -563,7 +563,6 @@
 	int port;
 	int at_least_one_hwif_enabled = 0;
 	ide_hwif_t *hwif, *mate = NULL;
-	static int secondpdc = 0;
 	u8 tmp;
 
 	index->all = 0xf0f0;
@@ -574,22 +573,10 @@
 	 
 	for (port = 0; port <= 1; ++port) {
 		ide_pci_enablebit_t *e = &(d->enablebits[port]);
-	
-		/* 
-		 * If this is a Promise FakeRaid controller,
-		 * the 2nd controller will be marked as 
-		 * disabled while it is actually there and enabled
-		 * by the bios for raid purposes. 
-		 * Skip the normal "is it enabled" test for those.
-		 */
-		if ((d->flags & IDEPCI_FLAG_FORCE_PDC) &&
-		    (secondpdc++==1) && (port==1))
-			goto controller_ok;
-			
+
 		if (e->reg && (pci_read_config_byte(dev, e->reg, &tmp) ||
 		    (tmp & e->mask) != e->val))
 			continue;	/* port not enabled */
-controller_ok:
 
 		if (d->channels	<= port)
 			break;
diff -Nru a/include/linux/hdreg.h b/include/linux/hdreg.h
--- a/include/linux/hdreg.h	2004-12-12 18:18:05 -08:00
+++ b/include/linux/hdreg.h	2004-12-12 18:18:05 -08:00
@@ -393,7 +393,8 @@
 #define HDIO_GET_IDENTITY	0x030d	/* get IDE identification info */
 #define HDIO_GET_WCACHE		0x030e	/* get write cache mode on|off */
 #define HDIO_GET_ACOUSTIC	0x030f	/* get acoustic value */
-#define	HDIO_GET_ADDRESS	0x0310	/* */
+
+/* 0x310 is reserved - used to be HDIO_GET_ADDRESS */
 
 #define HDIO_GET_BUSSTATE	0x031a	/* get the bus state of the hwif */
 #define HDIO_TRISTATE_HWIF	0x031b	/* execute a channel tristate */
@@ -418,7 +419,8 @@
 #define HDIO_SET_ACOUSTIC	0x032c	/* change acoustic behavior */
 #define HDIO_SET_BUSSTATE	0x032d	/* set the bus state of the hwif */
 #define HDIO_SET_QDMA		0x032e	/* change use-qdma flag */
-#define HDIO_SET_ADDRESS	0x032f	/* change lba addressing modes */
+
+/* 0x32f is reserved - used to be HDIO_SET_ADDRESS */
 
 /* bus states */
 enum {
diff -Nru a/include/linux/ide.h b/include/linux/ide.h
--- a/include/linux/ide.h	2004-12-12 18:18:05 -08:00
+++ b/include/linux/ide.h	2004-12-12 18:18:05 -08:00
@@ -755,7 +755,6 @@
 
 	u64		capacity64;	/* total number of sectors */
 
-	int		lun;		/* logical unit */
 	int		crc_count;	/* crc counter to reduce drive speed */
 	struct list_head list;
 	struct device	gendev;
@@ -1417,7 +1416,6 @@
 enum {
 	/* Uses ISA control ports not PCI ones. */
 	IDEPCI_FLAG_ISA_PORTS		= (1 << 0),
-	IDEPCI_FLAG_FORCE_PDC		= (1 << 1),
 };
 
 typedef struct ide_pci_device_s {
