lkml.org 
[lkml]   [2000]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] add __init to some IDE drivers

for 240t10p6, should be safe, please apply

--
Bartlomiej Zolnierkiewicz
<bkz@linux-ide.org>
diff -uNr linux-240t10p6/drivers/ide/alim15x3.c linux/drivers/ide/alim15x3.c
--- linux-240t10p6/drivers/ide/alim15x3.c Thu Oct 19 22:05:01 2000
+++ linux/drivers/ide/alim15x3.c Fri Oct 27 23:40:24 2000
@@ -691,7 +691,7 @@
}
}

-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 -uNr linux-240t10p6/drivers/ide/amd7409.c linux/drivers/ide/amd7409.c
--- linux-240t10p6/drivers/ide/amd7409.c Tue Oct 3 00:13:17 2000
+++ linux/drivers/ide/amd7409.c Fri Oct 27 23:40:50 2000
@@ -464,7 +464,7 @@
#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 -uNr linux-240t10p6/drivers/ide/hd.c linux/drivers/ide/hd.c
--- linux-240t10p6/drivers/ide/hd.c Tue Oct 3 00:14:24 2000
+++ linux/drivers/ide/hd.c Fri Oct 27 23:55:58 2000
@@ -723,7 +723,7 @@
* 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 -uNr linux-240t10p6/drivers/ide/hpt366.c linux/drivers/ide/hpt366.c
--- linux-240t10p6/drivers/ide/hpt366.c Tue Oct 3 00:16:08 2000
+++ linux/drivers/ide/hpt366.c Fri Oct 27 23:40:29 2000
@@ -698,7 +698,7 @@
#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 -uNr linux-240t10p6/drivers/ide/icside.c linux/drivers/ide/icside.c
--- linux-240t10p6/drivers/ide/icside.c Tue Oct 3 14:27:31 2000
+++ linux/drivers/ide/icside.c Fri Oct 27 23:53:40 2000
@@ -163,7 +163,7 @@
* 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 @@
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 @@
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 @@
return hwif || mate ? 0 : -1;
}

-int icside_init(void)
+int __init icside_init(void)
{
int autodma = 0;

diff -uNr linux-240t10p6/drivers/ide/opti621.c linux/drivers/ide/opti621.c
--- linux-240t10p6/drivers/ide/opti621.c Tue Jun 13 20:32:00 2000
+++ linux/drivers/ide/opti621.c Fri Oct 27 23:50:45 2000
@@ -308,7 +308,7 @@
/*
* 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 -uNr linux-240t10p6/drivers/ide/sl82c105.c linux/drivers/ide/sl82c105.c
--- linux-240t10p6/drivers/ide/sl82c105.c Tue Jun 13 20:29:51 2000
+++ linux/drivers/ide/sl82c105.c Fri Oct 27 23:43:24 2000
@@ -91,7 +91,7 @@
}
#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 @@
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 -uNr linux-240t10p6/drivers/ide/via82cxxx.c linux/drivers/ide/via82cxxx.c
--- linux-240t10p6/drivers/ide/via82cxxx.c Fri Oct 27 16:34:53 2000
+++ linux/drivers/ide/via82cxxx.c Fri Oct 27 23:41:01 2000
@@ -611,7 +611,7 @@
* 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);
\
 
 \ /
  Last update: 2005-03-22 12:45    [W:0.024 / U:13.808 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site