Merge with 2.3.10.

11 files changed, 53 insertions, 54 deletions

diff --git a/drivers/cdrom/aztcd.c b/drivers/cdrom/aztcd.c
index eaa4e8619..4c03f4917 100644
--- a/drivers/cdrom/aztcd.c
+++ b/drivers/cdrom/aztcd.c
@@ -1087,7 +1087,7 @@ static int aztGetToc(int multi)
 #ifdef AZT_KERNEL_PRIOR_2_1
 void aztcd_setup(char *str, int *ints)
 #else
-__initfunc(void aztcd_setup(char *str, int *ints))
+void __init aztcd_setup(char *str, int *ints)
 #endif
 {  if (ints[0] > 0)
       azt_port = ints[1];
@@ -1617,7 +1617,7 @@ static int  aztcd_release(struct inode * inode, struct file * file)
 #ifdef AZT_KERNEL_PRIOR_2_1
 int aztcd_init(void)
 #else
-__initfunc(int aztcd_init(void))
+int __init aztcd_init(void)
 #endif
 {       long int count, max_count;
 	unsigned char result[50];
diff --git a/drivers/cdrom/cdu31a.c b/drivers/cdrom/cdu31a.c
index c825b8344..edb90ee76 100644
--- a/drivers/cdrom/cdu31a.c
+++ b/drivers/cdrom/cdu31a.c
@@ -3251,10 +3251,10 @@ static struct cdrom_device_info scd_info = {
 /* The different types of disc loading mechanisms supported */
 static const char *load_mech[] __initdata = { "caddy", "tray", "pop-up", "unknown" };
 
-__initfunc(static void
+static void __init 
 get_drive_configuration(unsigned short base_io,
                         unsigned char res_reg[],
-                        unsigned int *res_size))
+                        unsigned int *res_size)
 {
    int retry_count;
 
@@ -3318,9 +3318,9 @@ get_drive_configuration(unsigned short base_io,
 /*
  * Set up base I/O and interrupts, called from main.c.
  */
-__initfunc(void
+void __init 
 cdu31a_setup(char *strings,
-	     int  *ints))
+	     int  *ints)
 {
    if (ints[0] > 0)
    {
@@ -3349,8 +3349,8 @@ static int cdu31a_block_size;
 /*
  * Initialize the driver.
  */
-__initfunc(int
-cdu31a_init(void))
+int __init 
+cdu31a_init(void)
 {
    struct s_sony_drive_config drive_config;
    unsigned int res_size;
diff --git a/drivers/cdrom/cm206.c b/drivers/cdrom/cm206.c
index 72f7cb981..3ab0533f8 100644
--- a/drivers/cdrom/cm206.c
+++ b/drivers/cdrom/cm206.c
@@ -1294,7 +1294,7 @@ static void cleanup(int level)
    check_region, 15 bits of one port and 6 of another make things
    likely enough to accept the region on the first hit...
  */
-__initfunc(int probe_base_port(int base))
+int __init probe_base_port(int base)
 {
   int b=0x300, e=0x370;		/* this is the range of start addresses */
   volatile int fool, i;
@@ -1314,7 +1314,7 @@ __initfunc(int probe_base_port(int base))
 
 #if !defined(MODULE) || defined(AUTO_PROBE_MODULE)
 /* Probe for irq# nr. If nr==0, probe for all possible irq's. */
-__initfunc(int probe_irq(int nr)) {
+int __init probe_irq(int nr){
   int irqs, irq;
   outw(dc_normal | READ_AHEAD, r_data_control);	/* disable irq-generation */
   sti(); 
@@ -1328,7 +1328,7 @@ __initfunc(int probe_irq(int nr)) {
 }
 #endif
 
-__initfunc(int cm206_init(void))
+int __init cm206_init(void)
 {
   uch e=0;
   long int size=sizeof(struct cm206_struct);
@@ -1413,7 +1413,7 @@ __initfunc(int cm206_init(void))
 
 static int cm206[2] = {0,0};	/* for compatible `insmod' parameter passing */
 
-__initfunc(void parse_options(void))
+void __init parse_options(void)
 {
   int i;
   for (i=0; i<2; i++) {
@@ -1447,7 +1447,7 @@ void cleanup_module(void)
 
 /* This setup function accepts either `auto' or numbers in the range
  * 3--11 (for irq) or 0x300--0x370 (for base port) or both. */
-__initfunc(void cm206_setup(char *s, int *p))
+void __init cm206_setup(char *s, int *p)
 {
   int i;
   if (!strcmp(s, "auto")) auto_probe=1;
diff --git a/drivers/cdrom/gscd.c b/drivers/cdrom/gscd.c
index cf5c1a556..07c36f51b 100644
--- a/drivers/cdrom/gscd.c
+++ b/drivers/cdrom/gscd.c
@@ -194,7 +194,7 @@ static int check_gscd_med_chg (kdev_t full_dev)
 }
 
 
-__initfunc(void gscd_setup (char *str, int *ints))
+void __init gscd_setup (char *str, int *ints)
 {
   if (ints[0] > 0) 
   {
@@ -851,7 +851,7 @@ int  i;
      return;
 }
 
-__initfunc(int find_drives (void))
+int __init find_drives (void)
 {
 int *pdrv;
 int drvnum;
@@ -902,7 +902,7 @@ int i;
     return drvnum;
 }    
 
-__initfunc(void init_cd_drive ( int num ))
+void __init init_cd_drive ( int num )
 {
 char resp [50];
 int  i;
@@ -994,7 +994,7 @@ void cleanup_module (void)
 
 
 /* Test for presence of drive and initialize it.  Called only at boot time. */
-__initfunc(int gscd_init (void))
+int __init gscd_init (void)
 {
    return my_gscd_init ();
 }
@@ -1002,7 +1002,7 @@ __initfunc(int gscd_init (void))
 
 /* This is the common initialisation for the GoldStar drive. */
 /* It is called at boot time AND for module init.           */
-__initfunc(int my_gscd_init (void))
+int __init my_gscd_init (void)
 {
 int i;
 int result;
diff --git a/drivers/cdrom/isp16.c b/drivers/cdrom/isp16.c
index f0b5e7499..7b0701707 100644
--- a/drivers/cdrom/isp16.c
+++ b/drivers/cdrom/isp16.c
@@ -77,8 +77,8 @@ void cleanup_module(void);
 #define ISP16_OUT(p,b) (outb(isp16_ctrl,ISP16_CTRL_PORT), outb(b,p))
 
 
-__initfunc(void
-isp16_setup(char *str, int *ints))
+void __init 
+isp16_setup(char *str, int *ints)
 {
   if ( ints[0] > 0 )
     isp16_cdrom_base = ints[1];
@@ -94,8 +94,8 @@ isp16_setup(char *str, int *ints))
  *  ISP16 initialisation.
  *
  */
-__initfunc(int
-isp16_init(void))
+int __init 
+isp16_init(void)
 {
   u_char expected_drive;
 
@@ -144,8 +144,8 @@ isp16_init(void))
   return(0);
 }
 
-__initfunc(static short
-isp16_detect(void))
+static short __init 
+isp16_detect(void)
 {
 
   if ( isp16_c929__detect() >= 0 )
@@ -154,8 +154,8 @@ isp16_detect(void))
     return(isp16_c928__detect());
 }
 
-__initfunc(static short
-isp16_c928__detect(void))
+static short __init 
+isp16_c928__detect(void)
 {
   u_char ctrl;
   u_char enable_cdrom;
@@ -203,8 +203,8 @@ isp16_c928__detect(void))
   return(i);
 }
 
-__initfunc(static short
-isp16_c929__detect(void))
+static short __init 
+isp16_c929__detect(void)
 {
   u_char ctrl;
   u_char tmp;
@@ -230,8 +230,8 @@ isp16_c929__detect(void))
   return(2);
 }
 
-__initfunc(static short
-isp16_cdi_config(int base, u_char drive_type, int irq, int dma))
+static short __init 
+isp16_cdi_config(int base, u_char drive_type, int irq, int dma)
 {
   u_char base_code;
   u_char irq_code;
diff --git a/drivers/cdrom/mcd.c b/drivers/cdrom/mcd.c
index 4297ae48c..81f9bd762 100644
--- a/drivers/cdrom/mcd.c
+++ b/drivers/cdrom/mcd.c
@@ -230,8 +230,7 @@ static struct cdrom_device_info mcd_info = {
 };
 
 
-
-__initfunc(void mcd_setup(char *str, int *ints))
+void __init mcd_setup(char *str, int *ints)
 {
    if (ints[0] > 0)
       mcd_port = ints[1];
@@ -1155,7 +1154,7 @@ static void cleanup(int level)
  * Test for presence of drive and initialize it.  Called at boot time.
  */
 
-__initfunc(int mcd_init(void))
+int __init mcd_init(void)
 {
 	int count;
 	unsigned char result[3];
diff --git a/drivers/cdrom/mcdx.c b/drivers/cdrom/mcdx.c
index 684d7a29e..fa3f36310 100644
--- a/drivers/cdrom/mcdx.c
+++ b/drivers/cdrom/mcdx.c
@@ -770,7 +770,7 @@ static int mcdx_media_changed(struct cdrom_device_info * cdi, int disc_nr)
 	return 1;
 }
 
-__initfunc(void mcdx_setup(char *str, int *pi))
+void __init mcdx_setup(char *str, int *pi)
 {
 	if (pi[0] > 0) mcdx_drive_map[0][0] = pi[1];
 	if (pi[0] > 1) mcdx_drive_map[0][1] = pi[2];
@@ -1013,7 +1013,7 @@ void cleanup_module(void)
 
 /* Support functions ************************************************/
 
-__initfunc(int mcdx_init_drive(int drive))
+int __init mcdx_init_drive(int drive)
 {
 	struct s_version version;
 	struct s_drive_stuff* stuffp;
@@ -1174,7 +1174,7 @@ __initfunc(int mcdx_init_drive(int drive))
 	return 0;
 }
 
-__initfunc(int mcdx_init(void))
+int __init mcdx_init(void)
 {
 	int drive;
 #ifdef MODULE
diff --git a/drivers/cdrom/optcd.c b/drivers/cdrom/optcd.c
index df829dfb9..68a22cbd1 100644
--- a/drivers/cdrom/optcd.c
+++ b/drivers/cdrom/optcd.c
@@ -1966,7 +1966,7 @@ static int opt_media_change(kdev_t dev)
 
 /* Returns 1 if a drive is detected with a version string
    starting with "DOLPHIN". Otherwise 0. */
-__initfunc(static int version_ok(void))
+static int __init version_ok(void)
 {
 	char devname[100];
 	int count, i, ch, status;
@@ -2022,7 +2022,7 @@ static struct file_operations opt_fops = {
 
 
 /* Get kernel parameter when used as a kernel driver */
-__initfunc(void optcd_setup(char *str, int *ints))
+void __init optcd_setup(char *str, int *ints)
 {
 	if (ints[0] > 0)
 		optcd_port = ints[1];
@@ -2030,7 +2030,7 @@ __initfunc(void optcd_setup(char *str, int *ints))
 
 /* Test for presence of drive and initialize it. Called at boot time
    or during module initialisation. */
-__initfunc(int optcd_init(void))
+int __init optcd_init(void)
 {
 	int status;
 
diff --git a/drivers/cdrom/sbpcd.c b/drivers/cdrom/sbpcd.c
index d19b940d6..3e704b0d8 100644
--- a/drivers/cdrom/sbpcd.c
+++ b/drivers/cdrom/sbpcd.c
@@ -3215,7 +3215,7 @@ static int cc_SubChanInfo(int frame, int count, u_char *buffer)
 }
 #endif FUTURE
 /*==========================================================================*/
-__initfunc(static void check_datarate(void))
+static void __init check_datarate(void)
 {
 	int i=0;
 	
@@ -3285,7 +3285,7 @@ static int c2_ReadError(int fam)
 }
 #endif
 /*==========================================================================*/
-__initfunc(static void ask_mail(void))
+static void __init ask_mail(void)
 {
 	int i;
 	
@@ -3304,7 +3304,7 @@ __initfunc(static void ask_mail(void))
 	msg(DBG_INF,"infobuf =%s\n", msgbuf);
 }
 /*==========================================================================*/
-__initfunc(static int check_version(void))
+static int __init check_version(void)
 {
 	int i, j, l;
 	int teac_possible=0;
@@ -3602,7 +3602,7 @@ static void switch_drive(int i)
 /*
  * probe for the presence of an interface card
  */
-__initfunc(static int check_card(int port))
+static int __init check_card(int port)
 {
 #undef N_RESPO
 #define N_RESPO 20
@@ -3706,7 +3706,7 @@ __initfunc(static int check_card(int port))
 /*
  * probe for the presence of drives on the selected controller
  */
-__initfunc(static int check_drives(void))
+static int __init check_drives(void)
 {
 	int i, j;
 	
@@ -5458,9 +5458,9 @@ static struct cdrom_device_info sbpcd_info = {
  *
  */
 #if (SBPCD_ISSUE-1)
-__initfunc(static void sbpcd_setup(const char *s, int *p))
+static void __init sbpcd_setup(const char *s, int *p)
 #else
-__initfunc(void sbpcd_setup(const char *s, int *p))
+void __init sbpcd_setup(const char *s, int *p)
 #endif
 {
 	setup_done++;
@@ -5512,7 +5512,7 @@ __initfunc(void sbpcd_setup(const char *s, int *p))
  *        port 0x330, we have to use an offset of 8; so, the real CDROM port
  *        address is 0x338.
  */
-__initfunc(static int config_spea(void))
+static int __init config_spea(void)
 {
 	/*
          * base address offset between configuration port and CDROM port,
@@ -5571,7 +5571,7 @@ __initfunc(static int config_spea(void))
 #ifdef MODULE
 int init_module(void)
 #else
-__initfunc(int SBPCD_INIT(void))
+int __init SBPCD_INIT(void)
 #endif MODULE
 {
 	int i=0, j=0;
diff --git a/drivers/cdrom/sjcd.c b/drivers/cdrom/sjcd.c
index 8d16b8363..35697369f 100644
--- a/drivers/cdrom/sjcd.c
+++ b/drivers/cdrom/sjcd.c
@@ -163,7 +163,7 @@ static int sjcd_cleanup(void);
  * Set up device, i.e., use command line data to set
  * base address.
  */
-__initfunc(void sjcd_setup( char *str, int *ints ))
+void __init sjcd_setup( char *str, int *ints )
 {
    if (ints[0] > 0)
       sjcd_base = ints[1];
@@ -1457,7 +1457,7 @@ static struct {
  * Test for presence of drive and initialize it. Called at boot time.
  * Probe cdrom, find out version and status.
  */
-__initfunc(int sjcd_init( void )){
+int __init sjcd_init( void ){
   int i;
 
   printk(KERN_INFO "SJCD: Sanyo CDR-H94A cdrom driver version %d.%d.\n", SJCD_VERSION_MAJOR,
diff --git a/drivers/cdrom/sonycd535.c b/drivers/cdrom/sonycd535.c
index b4bce6679..97b1afdde 100644
--- a/drivers/cdrom/sonycd535.c
+++ b/drivers/cdrom/sonycd535.c
@@ -1486,8 +1486,8 @@ static int sonycd535_block_size = CDU535_BLOCK_SIZE;
 /*
  * Initialize the driver.
  */
-__initfunc(int
-sony535_init(void))
+int __init 
+sony535_init(void)
 {
 	struct s535_sony_drive_config drive_config;
 	Byte cmd_buff[3];
@@ -1655,8 +1655,8 @@ sony535_init(void))
  *
  * the address value has to be the existing CDROM port address.
  */
-__initfunc(void
-sonycd535_setup(char *strings, int *ints))
+void __init 
+sonycd535_setup(char *strings, int *ints)
 {
 	/* if IRQ change and default io base desired,
 	 * then call with io base of 0