speedtch speedtch.c,1.72,1.73

[Duncan Sands]

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

Modified Files:
	speedtch.c 
Log Message:
Bump the version number to 1.10.  Make altsetting unsigned.  Remove .owner
field, as in the kernel tree.  Add some parentheses to improve readability.


Index: speedtch.c
===================================================================
RCS file: /home/cvs/speedtch/speedtch.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- speedtch.c	20 Nov 2005 13:34:07 -0000	1.72
+++ speedtch.c	10 Jan 2006 17:11:33 -0000	1.73
@@ -42,7 +42,7 @@
 #include "usbatm.h"
 
 #define DRIVER_AUTHOR	"Johan Verrept, Duncan Sands <duncan.sands at free.fr>"
-#define DRIVER_VERSION	"1.9"
+#define DRIVER_VERSION	"1.10"
 #define DRIVER_DESC	"Alcatel SpeedTouch USB driver version " DRIVER_VERSION
 
 static const char speedtch_driver_name[] = "speedtch";
@@ -74,12 +74,12 @@
 #define DEFAULT_ENABLE_ISOC	0
 #define DEFAULT_SW_BUFFERING	0
 
-static int altsetting = 0; // zero means to use the default
+static unsigned int altsetting = 0; // zero means use the default
 static int dl_512_first = DEFAULT_DL_512_FIRST;
 static int enable_isoc = DEFAULT_ENABLE_ISOC;
 static int sw_buffering = DEFAULT_SW_BUFFERING;
 
-module_param(altsetting, int, S_IRUGO | S_IWUSR);
+module_param(altsetting, uint, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(altsetting,
 		 "Alternative setting for data interface (bulk_default: "
 		 __MODULE_STRING(DEFAULT_BULK_ALTSETTING) "; isoc_default: "
@@ -111,7 +111,7 @@
 struct speedtch_instance_data {
 	struct usbatm_data *usbatm;
 
-	int altsetting;
+	unsigned int altsetting;
 
 	struct work_struct status_checker;
 
@@ -677,7 +677,6 @@
 static int speedtch_usb_probe(struct usb_interface *, const struct usb_device_id *);
 
 static struct usb_driver speedtch_usb_driver = {
-	.owner		= THIS_MODULE,
 	.name		= speedtch_driver_name,
 	.probe		= speedtch_usb_probe,
 	.disconnect	= usbatm_usb_disconnect,
@@ -793,7 +792,7 @@
 	if (!instance->altsetting)
 		instance->altsetting = use_isoc ? DEFAULT_ISOC_ALTSETTING : DEFAULT_BULK_ALTSETTING;
 
-	usbatm->flags |= use_isoc ? UDSL_USE_ISOC : 0;
+	usbatm->flags |= (use_isoc ? UDSL_USE_ISOC : 0);
 
 	INIT_WORK(&instance->status_checker, (void *)speedtch_check_status, instance);
 
@@ -821,7 +820,7 @@
 			      0x12, 0xc0, 0x07, 0x00,
 			      instance->scratch_buffer + OFFSET_7, SIZE_7, 500);
 
-	usbatm->flags |= ret == SIZE_7 ? UDSL_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 & UDSL_SKIP_HEAVY_INIT ? "already" : "not");