ChangeSet 1.962, 2003/01/21 15:09:55+08:00, [EMAIL PROTECTED]
[PATCH] USB: move udsl_atm_set_mac into speedtouch probe function
speedtouch: roll udsl_atm_set_mac into udsl_usb_probe.
diff -Nru a/drivers/usb/misc/speedtouch.c b/drivers/usb/misc/speedtouch.c
--- a/drivers/usb/misc/speedtouch.c Tue Feb 4 15:18:28 2003
+++ b/drivers/usb/misc/speedtouch.c Tue Feb 4 15:18:28 2003
@@ -106,6 +106,8 @@
#define UDSL_ENDPOINT_DATA_OUT 0x07
#define UDSL_ENDPOINT_DATA_IN 0x87
+#define hex2int(c) ( (c >= '0')&&(c <= '9') ? (c - '0') : ((c & 0xf)+9) )
+
/* usb_device_id struct */
static struct usb_device_id udsl_usb_ids [] = {
@@ -255,14 +257,6 @@
MOD_DEC_USE_COUNT;
}
-static void udsl_atm_set_mac (struct udsl_instance_data *instance, const char mac [6])
-{
- if (!instance->atm_dev)
- return;
-
- memcpy (instance->atm_dev->esi, mac, 6);
-}
-
/***************************************************************************
*
@@ -806,8 +800,6 @@
* usb driver entries
*
****************************************************************************/
-#define hex2int(c) ( (c >= '0')&&(c <= '9') ? (c - '0') : ((c & 0xf)+9) )
-
static int udsl_usb_ioctl (struct usb_interface *intf, unsigned int code, void
*user_data)
{
@@ -873,7 +865,8 @@
PDEBUG ("MAC is %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2],
mac[3], mac[4],
mac[5]);
- udsl_atm_set_mac (instance, mac);
+
+ memcpy (instance->atm_dev->esi, mac, 6);
usb_set_intfdata (intf, instance);
return 0;
-------------------------------------------------------
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel