Merge with 2.4.0-test11.

11 files changed, 15 insertions, 20 deletions

diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile
index d5b4b637e..f85ab2aa4 100644
--- a/drivers/ide/Makefile
+++ b/drivers/ide/Makefile
@@ -31,7 +31,7 @@ ide-obj-$(CONFIG_BLK_DEV_DTC2278)	+= dtc2278.o
 ide-obj-$(CONFIG_BLK_DEV_FALCON_IDE)	+= falconide.o
 ide-obj-$(CONFIG_BLK_DEV_GAYLE)		+= gayle.o
 ide-obj-$(CONFIG_BLK_DEV_Q40IDE)	+= q40ide.o
-ide-obj-$(CONFIG_BLK_DEV_HD)		+= hd.o
+obj-$(CONFIG_BLK_DEV_HD)		+= hd.o
 ide-obj-$(CONFIG_BLK_DEV_HPT34X)	+= hpt34x.o
 ide-obj-$(CONFIG_BLK_DEV_HPT366)	+= hpt366.o
 ide-obj-$(CONFIG_BLK_DEV_HT6560B)	+= ht6560b.o
diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c
index 813aecd3b..abf08c5a0 100644
--- a/drivers/ide/alim15x3.c
+++ b/drivers/ide/alim15x3.c
@@ -691,7 +691,7 @@ void __init ide_init_ali15x3 (ide_hwif_t *hwif)
 	}
 }
 
-void ide_dmacapable_ali15x3 (ide_hwif_t *hwif, unsigned long dmabase)
+void __init ide_dmacapable_ali15x3 (ide_hwif_t *hwif, unsigned long dmabase)
 {
 	if ((dmabase) && (m5229_revision < 0x20)) {
 		return;
diff --git a/drivers/ide/amd7409.c b/drivers/ide/amd7409.c
index ca23d3af4..d03f63b9f 100644
--- a/drivers/ide/amd7409.c
+++ b/drivers/ide/amd7409.c
@@ -464,7 +464,7 @@ void __init ide_init_amd7409 (ide_hwif_t *hwif)
 #endif /* CONFIG_BLK_DEV_IDEDMA */
 }
 
-void ide_dmacapable_amd7409 (ide_hwif_t *hwif, unsigned long dmabase)
+void __init ide_dmacapable_amd7409 (ide_hwif_t *hwif, unsigned long dmabase)
 {
 	ide_setup_dma(hwif, dmabase, 8);
 }
diff --git a/drivers/ide/hd.c b/drivers/ide/hd.c
index 698112b35..ca3a5c72b 100644
--- a/drivers/ide/hd.c
+++ b/drivers/ide/hd.c
@@ -723,7 +723,7 @@ static struct block_device_operations hd_fops = {
  * We enable interrupts in some of the routines after making sure it's
  * safe.
  */
-static void hd_geninit(void)
+static void __init hd_geninit(void)
 {
 	int drive;
 
diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c
index 270cacc61..abd6d8ac7 100644
--- a/drivers/ide/hpt366.c
+++ b/drivers/ide/hpt366.c
@@ -698,7 +698,7 @@ void __init ide_init_hpt366 (ide_hwif_t *hwif)
 #endif /* CONFIG_BLK_DEV_IDEDMA */
 }
 
-void ide_dmacapable_hpt366 (ide_hwif_t *hwif, unsigned long dmabase)
+void __init ide_dmacapable_hpt366 (ide_hwif_t *hwif, unsigned long dmabase)
 {
 	byte masterdma = 0, slavedma = 0;
 	byte dma_new = 0, dma_old = inb(dmabase+2);
diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c
index fb15adc4d..c727cb889 100644
--- a/drivers/ide/icside.c
+++ b/drivers/ide/icside.c
@@ -163,7 +163,7 @@ static const expansioncard_ops_t icside_ops_arcin_v6 = {
  * Purpose  : identify IDE interface type
  * Notes    : checks the description string
  */
-static iftype_t icside_identifyif (struct expansion_card *ec)
+static iftype_t __init icside_identifyif (struct expansion_card *ec)
 {
 	unsigned int addr;
 	iftype_t iftype;
@@ -505,7 +505,7 @@ icside_setup(unsigned long base, struct cardinfo *info, int irq)
 	return hwif;
 }
 
-static int icside_register_v5(struct expansion_card *ec, int autodma)
+static int __init icside_register_v5(struct expansion_card *ec, int autodma)
 {
 	unsigned long slot_port;
 	ide_hwif_t *hwif;
@@ -527,7 +527,7 @@ static int icside_register_v5(struct expansion_card *ec, int autodma)
 	return hwif ? 0 : -1;
 }
 
-static int icside_register_v6(struct expansion_card *ec, int autodma)
+static int __init icside_register_v6(struct expansion_card *ec, int autodma)
 {
 	unsigned long slot_port, port;
 	ide_hwif_t *hwif, *mate;
@@ -585,7 +585,7 @@ no_dma:
 	return hwif || mate ? 0 : -1;
 }
 
-int icside_init(void)
+int __init icside_init(void)
 {
 	int autodma = 0;
 
diff --git a/drivers/ide/ide-pci.c b/drivers/ide/ide-pci.c
index f1304a4a0..6e99442fa 100644
--- a/drivers/ide/ide-pci.c
+++ b/drivers/ide/ide-pci.c
@@ -528,10 +528,7 @@ static void __init ide_setup_pci_device (struct pci_dev *dev, ide_pci_device_t *
 	autodma = 1;
 #endif
 
-#if 1	/* what do do with this useful tool ??? */
-	if (pci_enable_device(dev))
-		return;
-#endif
+	pci_enable_device(dev);
 
 check_if_enabled:
 	if (pci_read_config_word(dev, PCI_COMMAND, &pcicmd)) {
diff --git a/drivers/ide/opti621.c b/drivers/ide/opti621.c
index f11c41d99..1e1b57f26 100644
--- a/drivers/ide/opti621.c
+++ b/drivers/ide/opti621.c
@@ -308,7 +308,7 @@ static void opti621_tune_drive (ide_drive_t *drive, byte pio)
 /*
  * ide_init_opti621() is called once for each hwif found at boot.
  */
-void ide_init_opti621 (ide_hwif_t *hwif)
+void __init ide_init_opti621 (ide_hwif_t *hwif)
 {
 	hwif->drives[0].drive_data = PIO_DONT_KNOW;
 	hwif->drives[1].drive_data = PIO_DONT_KNOW;
diff --git a/drivers/ide/sis5513.c b/drivers/ide/sis5513.c
index c00f3305a..571cae563 100644
--- a/drivers/ide/sis5513.c
+++ b/drivers/ide/sis5513.c
@@ -33,8 +33,6 @@
 
 static struct pci_dev *host_dev = NULL;
 
-#define arraysize(x)			(sizeof(x)/sizeof(*(x)))
-
 #define SIS5513_FLAG_ATA_00		0x00000000
 #define SIS5513_FLAG_ATA_16		0x00000001
 #define SIS5513_FLAG_ATA_33		0x00000002
@@ -545,7 +543,7 @@ unsigned int __init pci_init_sis5513 (struct pci_dev *dev, const char *name)
 
 	pci_read_config_byte(dev, PCI_LATENCY_TIMER, &latency);
 
-	for (i = 0; i < arraysize (SiSHostChipInfo) && !host_dev; i++) {
+	for (i = 0; i < ARRAY_SIZE (SiSHostChipInfo) && !host_dev; i++) {
 		host = pci_find_device (PCI_VENDOR_ID_SI,
 					SiSHostChipInfo[i].host_id,
 					NULL);
diff --git a/drivers/ide/sl82c105.c b/drivers/ide/sl82c105.c
index c58c612ed..2451e801d 100644
--- a/drivers/ide/sl82c105.c
+++ b/drivers/ide/sl82c105.c
@@ -91,7 +91,7 @@ static void tune_sl82c105(ide_drive_t *drive, byte pio)
 }
 #endif
 
-void ide_dmacapable_sl82c105(ide_hwif_t *hwif, unsigned long dmabase)
+void __init ide_dmacapable_sl82c105(ide_hwif_t *hwif, unsigned long dmabase)
 {
 	unsigned char rev;
 
@@ -107,7 +107,7 @@ void ide_dmacapable_sl82c105(ide_hwif_t *hwif, unsigned long dmabase)
 	ide_setup_dma(hwif, dmabase, 8);
 }
 
-void ide_init_sl82c105(ide_hwif_t *hwif)
+void __init ide_init_sl82c105(ide_hwif_t *hwif)
 {
 	struct pci_dev *dev = hwif->pci_dev;
 
diff --git a/drivers/ide/via82cxxx.c b/drivers/ide/via82cxxx.c
index 566dcc4d5..3ea1e261e 100644
--- a/drivers/ide/via82cxxx.c
+++ b/drivers/ide/via82cxxx.c
@@ -611,7 +611,7 @@ void __init ide_init_via82cxxx(ide_hwif_t *hwif)
  * We allow the BM-DMA driver only work on enabled interfaces.
  */
 
-void ide_dmacapable_via82cxxx(ide_hwif_t *hwif, unsigned long dmabase)
+void __init ide_dmacapable_via82cxxx(ide_hwif_t *hwif, unsigned long dmabase)
 {
 	if ((via_enabled >> hwif->channel) & 1)
 		ide_setup_dma(hwif, dmabase, 8);