patch-2.3.13 linux/drivers/parport/parport_atari.c

• Lines: 60
• Date: Mon Aug 9 12:32:28 1999
• Orig file: v2.3.12/linux/drivers/parport/parport_atari.c
• Orig date: Wed Jul 28 14:47:42 1999

diff -u --recursive --new-file v2.3.12/linux/drivers/parport/parport_atari.c linux/drivers/parport/parport_atari.c
@@ -92,7 +92,7 @@
 }
 
 static void
-parport_atari_init_state(struct parport_state *s)
+parport_atari_init_state(struct pardevice *d, struct parport_state *s)
 {
 }
 
@@ -140,8 +140,6 @@
 	NULL, /* data_forward - FIXME */
 	NULL, /* data_reverse - FIXME */
 
-	parport_atari_interrupt,
-
 	parport_atari_init_state,
 	parport_atari_save_state,
 	parport_atari_restore_state,
@@ -149,18 +147,18 @@
 	parport_atari_inc_use_count,
 	parport_atari_dec_use_count,
 
-	parport_ieee1284_epp_write_data,
-	parport_ieee1284_epp_read_data,
-	parport_ieee1284_epp_write_addr,
-	parport_ieee1284_epp_read_addr,
-
-	parport_ieee1284_ecp_write_data,
-	parport_ieee1284_ecp_read_data,
-	parport_ieee1284_ecp_write_addr,
-
-	parport_ieee1284_write_compat,
-	parport_ieee1284_read_nibble,
-	parport_ieee1284_read_byte,
+	NULL, /* epp_write_data */
+	NULL, /* epp_read_data */
+	NULL, /* epp_write_addr */
+	NULL, /* epp_read_addr */
+
+	NULL, /* ecp_write_data */
+	NULL, /* ecp_read_data */
+	NULL, /* ecp_write_addr */
+
+	NULL, /* compat_write_data */
+	NULL, /* nibble_read_data */
+	NULL, /* byte_read_data */
 };
 
 
@@ -221,8 +219,8 @@
 void
 cleanup_module(void)
 {
-	if (p->irq != PARPORT_IRQ_NONE)
-		free_irq(IRQ_MFP_BUSY, p);
+	if (this_port->irq != PARPORT_IRQ_NONE)
+		free_irq(IRQ_MFP_BUSY, this_port);
 	parport_proc_unregister(this_port);
 	parport_unregister_port(this_port);
 }