speedtch usbatm.c,1.39,1.40 usbatm.h,1.16,1.17

[Duncan Sands]

Update of /home/cvs/speedtch
In directory phoenix.infradead.org:/tmp/cvs-serv22877

Modified Files:
	usbatm.c usbatm.h 
Log Message:
Strip out the clear_halt stuff for the moment.


Index: usbatm.c
===================================================================
RCS file: /home/cvs/speedtch/usbatm.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- usbatm.c	6 May 2005 09:05:17 -0000	1.39
+++ usbatm.c	6 May 2005 09:09:01 -0000	1.40
@@ -270,12 +270,9 @@
 
 	spin_unlock_irqrestore(&channel->lock, flags);
 
-	if (unlikely(urb->status)) {
+	if (unlikely(urb->status))
 		/* throttle processing in case of an error */
 		mod_timer(&channel->delay, jiffies + msecs_to_jiffies(THROTTLE_MSECS));
-		if (urb->status == -EPIPE)		/* this one may be cleaned up at times */
-			schedule_work(&channel->clear_halt_work);
-	}
 	else
 		tasklet_schedule(&channel->tasklet);
 }
@@ -939,14 +936,6 @@
 	tasklet_schedule((struct tasklet_struct *) data);
 }
 
-static void usbatm_clear_halt(void *data)
-{
-	struct usbatm_channel *channel = data;
-
-	/* the processing will get restarted after throttling delay */
-	usb_clear_halt(channel->usbatm->usb_dev, channel->endpoint);
-}
-
 static inline void usbatm_init_channel(struct usbatm_channel *channel)
 {
 	spin_lock_init(&channel->lock);
@@ -954,7 +943,6 @@
 	channel->delay.function = usbatm_tasklet_schedule;
 	channel->delay.data = (unsigned long) &channel->tasklet;
 	init_timer(&channel->delay);
-	INIT_WORK(&channel->clear_halt_work, usbatm_clear_halt, channel);
 }
 
 int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id,
@@ -1165,8 +1153,6 @@
 	del_timer_sync(&instance->rx_channel.delay);
 	del_timer_sync(&instance->tx_channel.delay);
 
-	flush_scheduled_work();		/* in case we scheduled clear_halt */
-
 	if (instance->atm_dev && instance->driver->atm_stop)
 		instance->driver->atm_stop(instance, instance->atm_dev);
 

Index: usbatm.h
===================================================================
RCS file: /home/cvs/speedtch/usbatm.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- usbatm.h	3 May 2005 14:18:05 -0000	1.16
+++ usbatm.h	6 May 2005 09:09:01 -0000	1.17
@@ -133,7 +133,6 @@
 	struct list_head list;
 	struct tasklet_struct tasklet;
 	struct timer_list delay;
-	struct work_struct clear_halt_work;
 	struct usbatm_data *usbatm;
 };