speedtch usbatm.c,1.24,1.25

[Duncan Sands]

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

Modified Files:
	usbatm.c 
Log Message:
Name change.


Index: usbatm.c
===================================================================
RCS file: /home/cvs/speedtch/usbatm.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- usbatm.c	3 May 2005 08:24:25 -0000	1.24
+++ usbatm.c	3 May 2005 08:38:23 -0000	1.25
@@ -224,7 +224,7 @@
 	return trx;
 }
 
-static inline int usbatm_submit(struct usbatm_transceiver *trx)
+static inline int usbatm_submit_transceiver(struct usbatm_transceiver *trx)
 {
 	int ret;
 	struct usbatm_channel *channel = trx->channel;
@@ -234,7 +234,7 @@
 
 	ret = usb_submit_urb(trx->urb, GFP_ATOMIC);
 	if (ret) {
-		usb_dbg(channel->usbatm, "%s: trx 0x%p urb 0x%p submission failed (%d)!\n",
+		atm_dbg(channel->usbatm, "%s: trx 0x%p urb 0x%p submission failed (%d)!\n",
 			__func__, trx, trx->urb, ret);
 
 		/* consider all errors transient and return the buffer back to the queue */
@@ -497,7 +497,7 @@
 				usbatm_extract_cells(instance, urb->transfer_buffer,
 						     urb->actual_length);
 
-		if (usbatm_submit(rx))
+		if (usbatm_submit_transceiver(rx))
 			return;
 	}
 }
@@ -547,7 +547,7 @@
 		if (num_written == buf_size || !skb) {
 			tx->urb->transfer_buffer_length = num_written;
 
-			if (usbatm_submit(tx))
+			if (usbatm_submit_transceiver(tx))
 				break;
 			tx = NULL;
 		}
@@ -867,7 +867,7 @@
 
 	/* submit all rx URBs */
 	for (i = 0; i < num_rcv_urbs; i++)
-		usbatm_submit(instance->transceivers + i);
+		usbatm_submit_transceiver(instance->transceivers + i);
 
 	return 0;