Merge with Linux 2.4.0-test5-pre3.

7 files changed, 93 insertions, 147 deletions

diff --git a/drivers/cdrom/cdu31a.c b/drivers/cdrom/cdu31a.c
index 27405b3c3..8b969818b 100644
--- a/drivers/cdrom/cdu31a.c
+++ b/drivers/cdrom/cdu31a.c
@@ -3222,37 +3222,31 @@ scd_release(struct cdrom_device_info *cdi)
 }
 
 static struct cdrom_device_ops scd_dops = {
-  scd_open,                   /* open */
-  scd_release,                /* release */
-  scd_drive_status,           /* drive status */
-  scd_media_changed,          /* media changed */
-  scd_tray_move,              /* tray move */
-  scd_lock_door,              /* lock door */
-  scd_select_speed,           /* select speed */
-  NULL,                       /* select disc */
-  scd_get_last_session,       /* get last session */
-  scd_get_mcn,                /* get universal product code */
-  scd_reset,                  /* hard reset */
-  scd_audio_ioctl,            /* audio ioctl */
-  scd_dev_ioctl,              /* device-specific ioctl */
-  CDC_OPEN_TRAY | CDC_CLOSE_TRAY | CDC_LOCK | CDC_SELECT_SPEED | CDC_MULTI_SESSION | 
-  CDC_MULTI_SESSION | CDC_MCN | CDC_MEDIA_CHANGED | CDC_PLAY_AUDIO |
-  CDC_RESET | CDC_IOCTLS | CDC_DRIVE_STATUS, /* capability */
-  1,                            /* number of minor devices */
+	open:			scd_open,
+	release:		scd_release,
+	drive_status:		scd_drive_status,
+	media_changed:		scd_media_changed,
+	tray_move:		scd_tray_move,
+	lock_door:		scd_lock_door,
+	select_speed:		scd_select_speed,
+	get_last_session:	scd_get_last_session,
+	get_mcn:		scd_get_mcn,
+	reset:			scd_reset,
+	audio_ioctl:		scd_audio_ioctl,
+	dev_ioctl:		scd_dev_ioctl,
+	capability:		CDC_OPEN_TRAY | CDC_CLOSE_TRAY | CDC_LOCK |
+				CDC_SELECT_SPEED | CDC_MULTI_SESSION | 
+				CDC_MULTI_SESSION | CDC_MCN |
+				CDC_MEDIA_CHANGED | CDC_PLAY_AUDIO |
+				CDC_RESET | CDC_IOCTLS | CDC_DRIVE_STATUS,
+	n_minors:		1,
 };
 
 static struct cdrom_device_info scd_info = {
-  &scd_dops,                  /* device operations */
-  NULL,                       /* link */
-  NULL,                       /* handle */
-  0,			      /* devfs */
-  0,			      /* dev */
-  0,                          /* mask */
-  2,                          /* maximum speed */
-  1,                          /* number of discs */
-  0,                          /* options, not owned */
-  0,                          /* mc_flags, not owned */
-  0                           /* use count, not owned */
+	ops:		&scd_dops,
+	speed:		2,
+	capacity:	1,
+	name:		"cdu31a"
 };
 
 /* The different types of disc loading mechanisms supported */
diff --git a/drivers/cdrom/cm206.c b/drivers/cdrom/cm206.c
index facf6223d..5f09347cf 100644
--- a/drivers/cdrom/cm206.c
+++ b/drivers/cdrom/cm206.c
@@ -1235,40 +1235,31 @@ int cm206_select_speed(struct cdrom_device_info * cdi, int speed)
 }
 
 static struct cdrom_device_ops cm206_dops = {
-  cm206_open,			/* open */
-  cm206_release,		/* release */
-  cm206_drive_status,		/* drive status */
-  cm206_media_changed,		/* media changed */
-  cm206_tray_move,		/* tray move */
-  cm206_lock_door,		/* lock door */
-  cm206_select_speed,		/* select speed */
-  NULL,				/* select disc */
-  cm206_get_last_session,	/* get last session */
-  cm206_get_upc,		/* get universal product code */
-  cm206_reset,			/* hard reset */
-  cm206_audio_ioctl,		/* audio ioctl */
-  cm206_ioctl,			/* device-specific ioctl */
-  CDC_CLOSE_TRAY | CDC_OPEN_TRAY | CDC_LOCK | CDC_MULTI_SESSION |
-    CDC_MEDIA_CHANGED | CDC_MCN | CDC_PLAY_AUDIO | CDC_SELECT_SPEED |
-    CDC_IOCTLS | CDC_DRIVE_STATUS, 
-    /* capability */
-  1,				/* number of minor devices */
+	open:			cm206_open,
+	release:		cm206_release,
+	drive_status:		cm206_drive_status,
+	media_changed:		cm206_media_changed,
+	tray_move:		cm206_tray_move,
+	lock_door:		cm206_lock_door,
+	select_speed:		cm206_select_speed,
+	get_last_session:	cm206_get_last_session,
+	get_mcn:		cm206_get_upc,
+	reset:			cm206_reset,
+	audio_ioctl:		cm206_audio_ioctl,
+	dev_ioctl:		cm206_ioctl,
+	capability:		CDC_CLOSE_TRAY | CDC_OPEN_TRAY | CDC_LOCK |
+				CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
+				CDC_MCN | CDC_PLAY_AUDIO | CDC_SELECT_SPEED |
+				CDC_IOCTLS | CDC_DRIVE_STATUS, 
+	n_minors:		1,
 };
 
 
 static struct cdrom_device_info cm206_info = {
-  &cm206_dops,                  /* device operations */
-  NULL,				/* link */
-  NULL,				/* handle (not used by cm206) */
-  0,				/* devfs handle */
-  0,				/* dev */
-  0,				/* mask */
-  2,				/* maximum speed */
-  1,				/* number of discs */
-  0,				/* options, not owned */
-  0,				/* mc_flags, not owned */
-  0,				/* use count, not owned */
-  "cm206"			/* name of the device type */
+	ops:		&cm206_dops,
+	speed:		2,
+	capacity:	1,
+	name:		"cm206",
 };
 
 /* This routine gets called during initialization if things go wrong,
diff --git a/drivers/cdrom/gscd.c b/drivers/cdrom/gscd.c
index dc8870491..0e8940117 100644
--- a/drivers/cdrom/gscd.c
+++ b/drivers/cdrom/gscd.c
@@ -995,8 +995,7 @@ long err;
 
 void __exit exit_gscd(void)
 {
-
-   del_timer_async(&gscd_timer);
+   CLEAR_TIMER;
 
    devfs_unregister(devfs_find_handle(NULL, "gscd", 0, 0, DEVFS_SPECIAL_BLK,
 				      0));
diff --git a/drivers/cdrom/mcd.c b/drivers/cdrom/mcd.c
index 0f59831b7..12c85365d 100644
--- a/drivers/cdrom/mcd.c
+++ b/drivers/cdrom/mcd.c
@@ -206,37 +206,21 @@ int mcd_drive_status(struct cdrom_device_info * cdi, int slot_nr);
 static struct timer_list mcd_timer;
 
 static struct cdrom_device_ops mcd_dops = {
-  mcd_open,                   /* open */
-  mcd_release,                /* release */
-  mcd_drive_status,           /* drive status */
-  //NULL,           /* drive status */
-  mcd_media_changed,          /* media changed */
-  mcd_tray_move,              /* tray move */
-  NULL,                       /* lock door */
-  NULL,                       /* select speed */
-  NULL,                       /* select disc */
-  NULL,                       /* get last session */
-  NULL,                       /* get universal product code */
-  NULL,                       /* hard reset */
-  mcd_audio_ioctl,            /* audio ioctl */
-  NULL,                  /* device-specific ioctl */
-  CDC_OPEN_TRAY | CDC_MEDIA_CHANGED | CDC_PLAY_AUDIO
-  | CDC_DRIVE_STATUS, /* capability */
-  0,                            /* number of minor devices */
+	open:			mcd_open,
+	release:		mcd_release,
+	drive_status:		mcd_drive_status,
+	media_changed:		mcd_media_changed,
+	tray_move:		mcd_tray_move,
+	audio_ioctl:		mcd_audio_ioctl,
+	capability:		CDC_OPEN_TRAY | CDC_MEDIA_CHANGED |
+				CDC_PLAY_AUDIO | CDC_DRIVE_STATUS,
 };
 
 static struct cdrom_device_info mcd_info = {
-  &mcd_dops,                    /* device operations */
-  NULL,                         /* link */
-  NULL,                         /* handle */
-  0,		                /* dev */
-  0,                            /* mask */
-  2,                            /* maximum speed */
-  1,                            /* number of discs */
-  0,                            /* options, not owned */
-  0,                            /* mc_flags, not owned */
-  0,                            /* use count, not owned */
-  "mcd",                         /* name of the device type */
+	ops:			&mcd_dops,
+	speed:			2,
+	capacity:		1,
+	name:			"mcd",
 };
 
 #ifndef MODULE
diff --git a/drivers/cdrom/mcdx.c b/drivers/cdrom/mcdx.c
index ac667047b..160261406 100644
--- a/drivers/cdrom/mcdx.c
+++ b/drivers/cdrom/mcdx.c
@@ -275,41 +275,24 @@ static struct s_drive_stuff* mcdx_irq_map[16] =
 MODULE_PARM(mcdx, "1-4i");
 
 static struct cdrom_device_ops mcdx_dops = {
-  mcdx_open,                   /* open */
-  mcdx_close,                  /* release */
-  NULL,           /* drive status */
-  mcdx_media_changed,         /* media changed */
-  mcdx_tray_move,             /* tray move */
-  mcdx_lockdoor,              /* lock door */
-  NULL,                       /* select speed */
-  NULL,                       /* select disc */
-  NULL,                       /* get last session */
-  NULL,                       /* get universal product code */
-  NULL,                       /* hard reset */
-  mcdx_audio_ioctl,            /* audio ioctl */
-  NULL,                  /* device-specific ioctl */
-  CDC_OPEN_TRAY | CDC_LOCK | CDC_MEDIA_CHANGED | CDC_PLAY_AUDIO
-  | CDC_DRIVE_STATUS, /* capability */
-  0,                            /* number of minor devices */
+		open:			mcdx_open,
+		release:		mcdx_close,
+		media_changed:	mcdx_media_changed,
+		tray_move:		mcdx_tray_move,
+		lock_door:		mcdx_lockdoor,
+		audio_ioctl:	mcdx_audio_ioctl,
+		capability:		CDC_OPEN_TRAY | CDC_LOCK | CDC_MEDIA_CHANGED |
+						CDC_PLAY_AUDIO | CDC_DRIVE_STATUS,
 };
 
 static struct cdrom_device_info mcdx_info = {
-  &mcdx_dops,                    /* device operations */
-  NULL,                         /* link */
-  NULL,                         /* handle */
-  0,				/* de, devfs */
-  0,		                /* dev */
-  0,                            /* mask */
-  2,                            /* maximum speed */
-  1,                            /* number of discs */
-  0,                            /* options, not owned */
-  0,                            /* mc_flags, not owned */
-  0,                            /* use count, not owned */
-  "mcdx",                         /* name of the device type */
+	ops:				&mcdx_dops,
+	speed:				2,
+	capacity:			1,
+	name:				"mcdx",
 };
 
 
-
 /* KERNEL INTERFACE FUNCTIONS **************************************/
 
 
diff --git a/drivers/cdrom/sbpcd.c b/drivers/cdrom/sbpcd.c
index 2f65bb525..df2174a8c 100644
--- a/drivers/cdrom/sbpcd.c
+++ b/drivers/cdrom/sbpcd.c
@@ -5409,36 +5409,31 @@ static void sbpcd_release(struct cdrom_device_info * cdi)
  */
 static int sbpcd_media_changed( struct cdrom_device_info *cdi, int disc_nr);
 static struct cdrom_device_ops sbpcd_dops = {
-  sbpcd_open,                   /* open */
-  sbpcd_release,                /* release */
-  sbpcd_drive_status,           /* drive status */
-  sbpcd_media_changed,          /* media changed */
-  sbpcd_tray_move,              /* tray move */
-  sbpcd_lock_door,              /* lock door */
-  sbpcd_select_speed,           /* select speed */
-  NULL,                         /* select disc */
-  sbpcd_get_last_session,       /* get last session */
-  sbpcd_get_mcn,                /* get universal product code */
-  sbpcd_reset,                  /* hard reset */
-  sbpcd_audio_ioctl,            /* audio ioctl */
-  sbpcd_dev_ioctl,              /* device-specific ioctl */
-  CDC_CLOSE_TRAY | CDC_OPEN_TRAY | CDC_LOCK | CDC_MULTI_SESSION |
-    CDC_MEDIA_CHANGED | CDC_MCN | CDC_PLAY_AUDIO | CDC_IOCTLS, /* capability */
-  1,                            /* number of minor devices */
+	open:			sbpcd_open,
+	release:		sbpcd_release,
+	drive_status:		sbpcd_drive_status,
+	media_changed:		sbpcd_media_changed,
+	tray_move:		sbpcd_tray_move,
+	lock_door:		sbpcd_lock_door,
+	select_speed:		sbpcd_select_speed,
+	get_last_session:	sbpcd_get_last_session,
+	get_mcn:		sbpcd_get_mcn,
+	reset:			sbpcd_reset,
+	audio_ioctl:		sbpcd_audio_ioctl,
+	dev_ioctl:		sbpcd_dev_ioctl,
+	capability:		CDC_CLOSE_TRAY | CDC_OPEN_TRAY | CDC_LOCK |
+				CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
+				CDC_MCN | CDC_PLAY_AUDIO | CDC_IOCTLS,
+	n_minors:		1,
 };
 
 static struct cdrom_device_info sbpcd_info = {
-  &sbpcd_dops,                /* device operations */
-  NULL,                       /* link */
-  NULL,                       /* handle */
-  0,		              /* dev */
-  0,                          /* mask */
-  2,                          /* maximum speed */
-  1,                          /* number of discs */
-  0,                          /* options, not owned */
-  0,                          /* mc_flags, not owned */
-  0                           /* use count, not owned */
+	ops:			&sbpcd_dops,
+	speed:			2,
+	capacity:		1,
+	name:			"sbpcd",
 };
+
 /*==========================================================================*/
 /*
  * accept "kernel command line" parameters 
diff --git a/drivers/cdrom/sonycd535.c b/drivers/cdrom/sonycd535.c
index 945facb97..8349e5928 100644
--- a/drivers/cdrom/sonycd535.c
+++ b/drivers/cdrom/sonycd535.c
@@ -1691,10 +1691,10 @@ sony535_exit(void)
 
 	release_region(sony535_cd_base_io, 4);
 	for (i = 0; i < sony_buffer_sectors; i++)
-		kfree_s(sony_buffer[i], CDU535_BLOCK_SIZE);
-	kfree_s(sony_buffer, 4 * sony_buffer_sectors);
-	kfree_s(last_sony_subcode, sizeof *last_sony_subcode);
-	kfree_s(sony_toc, sizeof *sony_toc);
+		kfree(sony_buffer[i]);
+	kfree(sony_buffer);
+	kfree(last_sony_subcode);
+	kfree(sony_toc);
 	devfs_unregister(devfs_find_handle(NULL, CDU535_HANDLE, 0, 0,
 					   DEVFS_SPECIAL_BLK, 0));
 	if (devfs_unregister_blkdev(MAJOR_NR, CDU535_HANDLE) == -EINVAL)