speedtch cxacru.c, 1.38, 1.39 speedtch.c, 1.71, 1.72 usbatm.c, 1.57, 1.58 usbatm.h, 1.27, 1.28

[Duncan Sands]

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

Modified Files:
	cxacru.c speedtch.c usbatm.c usbatm.h 
Log Message:
Use UDSL rather than USBATM when it concerns mini-drivers as well as usbatm
proper.


Index: cxacru.c
===================================================================
RCS file: /home/cvs/speedtch/cxacru.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- cxacru.c	20 Nov 2005 13:29:59 -0000	1.38
+++ cxacru.c	20 Nov 2005 13:34:07 -0000	1.39
@@ -723,7 +723,7 @@
 
 	usbatm_instance->driver_data = instance;
 
-	usbatm_instance->flags = cxacru_card_status(instance) ? 0 : USBATM_SKIP_HEAVY_INIT;
+	usbatm_instance->flags = cxacru_card_status(instance) ? 0 : UDSL_SKIP_HEAVY_INIT;
 
 	return 0;
 

Index: speedtch.c
===================================================================
RCS file: /home/cvs/speedtch/speedtch.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- speedtch.c	20 Nov 2005 13:29:59 -0000	1.71
+++ speedtch.c	20 Nov 2005 13:34:07 -0000	1.72
@@ -793,7 +793,7 @@
 	if (!instance->altsetting)
 		instance->altsetting = use_isoc ? DEFAULT_ISOC_ALTSETTING : DEFAULT_BULK_ALTSETTING;
 
-	usbatm->flags |= use_isoc ? USBATM_USE_ISOC : 0;
+	usbatm->flags |= use_isoc ? UDSL_USE_ISOC : 0;
 
 	INIT_WORK(&instance->status_checker, (void *)speedtch_check_status, instance);
 
@@ -821,11 +821,11 @@
 			      0x12, 0xc0, 0x07, 0x00,
 			      instance->scratch_buffer + OFFSET_7, SIZE_7, 500);
 
-	usbatm->flags |= ret == SIZE_7 ? USBATM_SKIP_HEAVY_INIT : 0;
+	usbatm->flags |= ret == SIZE_7 ? UDSL_SKIP_HEAVY_INIT : 0;
 
-	usb_dbg(usbatm, "%s: firmware %s loaded\n", __func__, usbatm->flags & USBATM_SKIP_HEAVY_INIT ? "already" : "not");
+	usb_dbg(usbatm, "%s: firmware %s loaded\n", __func__, usbatm->flags & UDSL_SKIP_HEAVY_INIT ? "already" : "not");
 
-	if (!(usbatm->flags & USBATM_SKIP_HEAVY_INIT))
+	if (!(usbatm->flags & UDSL_SKIP_HEAVY_INIT))
 		if ((ret = usb_reset_device(usb_dev)) < 0) {
 			usb_err(usbatm, "%s: device reset failed (%d)!\n", __func__, ret);
 			goto fail_free;

Index: usbatm.c
===================================================================
RCS file: /home/cvs/speedtch/usbatm.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- usbatm.c	20 Nov 2005 13:29:59 -0000	1.57
+++ usbatm.c	20 Nov 2005 13:34:07 -0000	1.58
@@ -1124,7 +1124,7 @@
 	instance->tx_channel.buf_size = snd_buf_size;
 	instance->rx_channel.usbatm = instance->tx_channel.usbatm = instance;
 
-	if ((instance->flags & USBATM_USE_ISOC) && driver->isoc_in)
+	if ((instance->flags & UDSL_USE_ISOC) && driver->isoc_in)
 		instance->rx_channel.endpoint = usb_rcvisocpipe(usb_dev, driver->isoc_in);
 	else
 		instance->rx_channel.endpoint = usb_rcvbulkpipe(usb_dev, driver->bulk_in);
@@ -1213,7 +1213,7 @@
 		goto fail_unbind;
 	}
 
-	if (!(instance->flags & USBATM_SKIP_HEAVY_INIT) && driver->heavy_init) {
+	if (!(instance->flags & UDSL_SKIP_HEAVY_INIT) && driver->heavy_init) {
 		error = usbatm_heavy_init(instance);
 	} else {
 		complete(&instance->thread_exited);	/* pretend that heavy_init was run */

Index: usbatm.h
===================================================================
RCS file: /home/cvs/speedtch/usbatm.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- usbatm.h	20 Nov 2005 13:29:59 -0000	1.27
+++ usbatm.h	20 Nov 2005 13:34:07 -0000	1.28
@@ -92,8 +92,8 @@
 
 /* flags, set by mini-driver in bind() */
 
-#define USBATM_SKIP_HEAVY_INIT	(1<<0)
-#define USBATM_USE_ISOC		(1<<1)
+#define UDSL_SKIP_HEAVY_INIT	(1<<0)
+#define UDSL_USE_ISOC		(1<<1)
 
 
 /* mini driver */