patch-2.3.35 linux/drivers/usb/usb.h

Next file: linux/drivers/usb/uss720.c
Previous file: linux/drivers/usb/usb.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.34/linux/drivers/usb/usb.h linux/drivers/usb/usb.h
@@ -227,8 +227,8 @@
 
 static __inline__ void wait_ms(unsigned int ms)
 {
-        current->state = TASK_UNINTERRUPTIBLE;
-        schedule_timeout(1 + ms * HZ / 1000);
+	current->state = TASK_UNINTERRUPTIBLE;
+	schedule_timeout(1 + ms * HZ / 1000);
 }
 
 typedef struct {
@@ -371,7 +371,7 @@
 	int num_altsetting;		/* number of alternate settings */
 	int max_altsetting;             /* total memory allocated */
  
-        struct usb_driver *driver;	/* driver */
+	struct usb_driver *driver;	/* driver */
 	void *private_data;
 };
 
@@ -475,35 +475,35 @@
 
 #define FILL_CONTROL_URB(a,aa,b,c,d,e,f,g) \
     do {\
-	a->dev=aa;\
-	a->pipe=b;\
-	a->setup_packet=c;\
-	a->transfer_buffer=d;\
-	a->transfer_buffer_length=e;\
-	a->complete=f;\
-	a->context=g;\
+	(a)->dev=aa;\
+	(a)->pipe=b;\
+	(a)->setup_packet=c;\
+	(a)->transfer_buffer=d;\
+	(a)->transfer_buffer_length=e;\
+	(a)->complete=f;\
+	(a)->context=g;\
     } while (0)
 
 #define FILL_BULK_URB(a,aa,b,c,d,e,f) \
     do {\
-	a->dev=aa;\
-	a->pipe=b;\
-	a->transfer_buffer=c;\
-	a->transfer_buffer_length=d;\
-	a->complete=e;\
-	a->context=f;\
+	(a)->dev=aa;\
+	(a)->pipe=b;\
+	(a)->transfer_buffer=c;\
+	(a)->transfer_buffer_length=d;\
+	(a)->complete=e;\
+	(a)->context=f;\
     } while (0)
     
 #define FILL_INT_URB(a,aa,b,c,d,e,f,g) \
     do {\
-	a->dev=aa;\
-	a->pipe=b;\
-	a->transfer_buffer=c;\
-	a->transfer_buffer_length=d;\
-	a->complete=e;\
-	a->context=f;\
-	a->interval=g;\
-	a->start_frame=-1;\
+	(a)->dev=aa;\
+	(a)->pipe=b;\
+	(a)->transfer_buffer=c;\
+	(a)->transfer_buffer_length=d;\
+	(a)->complete=e;\
+	(a)->context=f;\
+	(a)->interval=g;\
+	(a)->start_frame=-1;\
     } while (0)
 
 purb_t usb_alloc_urb(int iso_packets);
@@ -561,7 +561,6 @@
 	int bandwidth_isoc_reqs;	/* number of Isoc. requesters */
 
 	/* procfs entry */
-	int proc_busnum;
 	struct proc_dir_entry *proc_entry;
 };
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)