1 files changed, 8 insertions, 10 deletions

diff --git a/drivers/cdrom/sbpcd.c b/drivers/cdrom/sbpcd.c
index 452d34675159..466e9c2974bd 100644
--- a/drivers/cdrom/sbpcd.c
+++ b/drivers/cdrom/sbpcd.c
@@ -742,13 +742,10 @@ static struct sbpcd_drive *current_drive = D_S;
 unsigned long cli_sti; /* for saving the processor flags */
 #endif
 /*==========================================================================*/
-static struct timer_list delay_timer =
-                TIMER_INITIALIZER(mark_timeout_delay, 0, 0);
-static struct timer_list data_timer =
-                TIMER_INITIALIZER(mark_timeout_data, 0, 0);
+static DEFINE_TIMER(delay_timer, mark_timeout_delay, 0, 0);
+static DEFINE_TIMER(data_timer, mark_timeout_data, 0, 0);
 #if 0
-static struct timer_list audio_timer =
-                TIMER_INITIALIZER(mark_timeout_audio, 0, 0);
+static DEFINE_TIMER(audio_timer, mark_timeout_audio, 0, 0);
 #endif
 /*==========================================================================*/
 /*
@@ -830,8 +827,7 @@ static void mark_timeout_audio(u_long i)
 static void sbp_sleep(u_int time)
 {
         sti();
-        current->state = TASK_INTERRUPTIBLE;
-        schedule_timeout(time);
+        schedule_timeout_interruptible(time);
         sti();
 }
 /*==========================================================================*/
@@ -4219,7 +4215,8 @@ static int sbpcd_dev_ioctl(struct cdrom_device_info *cdi, u_int cmd,
                 
         case CDROMAUDIOBUFSIZ: /* configure the audio buffer size */
                 msg(DBG_IOC,"ioctl: CDROMAUDIOBUFSIZ entered.\n");
-                if (current_drive->sbp_audsiz>0) vfree(current_drive->aud_buf);
+                if (current_drive->sbp_audsiz>0)
+                        vfree(current_drive->aud_buf);
                 current_drive->aud_buf=NULL;
                 current_drive->sbp_audsiz=arg;
                 
@@ -5913,7 +5910,8 @@ static void sbpcd_exit(void)
                 put_disk(D_S[j].disk);
                 devfs_remove("sbp/c0t%d", j);
                 vfree(D_S[j].sbp_buf);
-                if (D_S[j].sbp_audsiz>0) vfree(D_S[j].aud_buf);
+                if (D_S[j].sbp_audsiz>0)
+                        vfree(D_S[j].aud_buf);
                 if ((unregister_cdrom(D_S[j].sbpcd_infop) == -EINVAL))
                 {
                         msg(DBG_INF, "What's that: can't unregister info %s.\n", major_name);