patch-2.4.8 linux/drivers/s390/char/tape3490.c

• Lines: 53
• Date: Wed Jul 25 14:12:02 2001
• Orig file: v2.4.7/linux/drivers/s390/char/tape3490.c
• Orig date: Wed Apr 11 19:02:28 2001

diff -u --recursive --new-file v2.4.7/linux/drivers/s390/char/tape3490.c linux/drivers/s390/char/tape3490.c
@@ -71,22 +71,30 @@
 };
 
 void
-tape3490_setup_assist (tape_info_t * tape)
+tape3490_setup_assist (tape_info_t * ti)
 {
 	tape3490_disc_data_t *data = NULL;
 #ifdef TAPE_DEBUG
     debug_text_event (tape_debug_area,6,"3490 dsetu");
     debug_text_event (tape_debug_area,6,"dev:");
-    debug_int_event (tape_debug_area,6,tape->blk_minor);
+    debug_int_event (tape_debug_area,6,ti->blk_minor);
 #endif /* TAPE_DEBUG */
 	while (data == NULL)
 		data = kmalloc (sizeof (tape3490_disc_data_t), GFP_KERNEL);
 	data->modeset_byte = 0x00;
-	tape->discdata = (void *) data;
+	ti->discdata = (void *) data;
 }
 
+
+void
+tape3490_shutdown (int autoprobe) {
+    if (autoprobe)
+	s390_device_unregister(&tape3490_devreg);
+}
+
+
 tape_discipline_t *
-tape3490_init (void)
+tape3490_init (int autoprobe)
 {
 	tape_discipline_t *disc;
 #ifdef TAPE_DEBUG
@@ -131,6 +139,7 @@
 	disc->mtmkpart = tape34xx_mtmkpart;
 	disc->mtiocget = tape34xx_mtiocget;
 	disc->mtiocpos = tape34xx_mtiocpos;
+	disc->shutdown = tape3490_shutdown;
 	disc->discipline_ioctl_overload = tape34xx_ioctl_overload;
 	disc->event_table = &tape3490_event_handler_table;
 	disc->default_handler = tape34xx_default_handler;
@@ -138,7 +147,8 @@
 	disc->free_bread = tape34xx_free_bread;
 	disc->tape = NULL;	/* pointer for backreference */
 	disc->next = NULL;
-	s390_device_register(&tape3490_devreg);
+	if (autoprobe)
+	    s390_device_register(&tape3490_devreg);
 #ifdef TAPE_DEBUG
 	debug_text_event (tape_debug_area,3,"3490 regis");
 #endif /* TAPE_DEBUG */