diff options
author | David Brownell <david-b@pacbell.net> | 2007-07-01 20:55:50 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-07-12 19:34:43 -0400 |
commit | 2d70c99b9340fa6c834fa6e32209e153f35a3e20 (patch) | |
tree | cbd098df25e1af57abdfee9aecd9be88a6571b44 /drivers/usb/gadget/goku_udc.h | |
parent | 70790f6339a868e2a0d643f44899418f64a95943 (diff) |
USB: goku_udc trivial cleanups
Minor fixes to goku_udc ... whitespace, let -DDEBUG do its thing,
check the return value of device_register(), sparse tweaks.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/gadget/goku_udc.h')
-rw-r--r-- | drivers/usb/gadget/goku_udc.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/usb/gadget/goku_udc.h b/drivers/usb/gadget/goku_udc.h index ea8c8e58cabf..bc4eb1e0b507 100644 --- a/drivers/usb/gadget/goku_udc.h +++ b/drivers/usb/gadget/goku_udc.h | |||
@@ -41,8 +41,10 @@ struct goku_udc_regs { | |||
41 | #define INT_SYSERROR 0x40000 | 41 | #define INT_SYSERROR 0x40000 |
42 | #define INT_PWRDETECT 0x80000 | 42 | #define INT_PWRDETECT 0x80000 |
43 | 43 | ||
44 | #define INT_DEVWIDE (INT_PWRDETECT|INT_SYSERROR/*|INT_ERR*/|INT_USBRESET|INT_SUSPEND) | 44 | #define INT_DEVWIDE \ |
45 | #define INT_EP0 (INT_SETUP|INT_ENDPOINT0/*|INT_STATUS*/|INT_STATUSNAK) | 45 | (INT_PWRDETECT|INT_SYSERROR/*|INT_ERR*/|INT_USBRESET|INT_SUSPEND) |
46 | #define INT_EP0 \ | ||
47 | (INT_SETUP|INT_ENDPOINT0/*|INT_STATUS*/|INT_STATUSNAK) | ||
46 | 48 | ||
47 | u32 dma_master; | 49 | u32 dma_master; |
48 | #define MST_EOPB_DIS 0x0800 | 50 | #define MST_EOPB_DIS 0x0800 |
@@ -231,7 +233,7 @@ struct goku_request { | |||
231 | enum ep0state { | 233 | enum ep0state { |
232 | EP0_DISCONNECT, /* no host */ | 234 | EP0_DISCONNECT, /* no host */ |
233 | EP0_IDLE, /* between STATUS ack and SETUP report */ | 235 | EP0_IDLE, /* between STATUS ack and SETUP report */ |
234 | EP0_IN, EP0_OUT, /* data stage */ | 236 | EP0_IN, EP0_OUT, /* data stage */ |
235 | EP0_STATUS, /* status stage */ | 237 | EP0_STATUS, /* status stage */ |
236 | EP0_STALL, /* data or status stages */ | 238 | EP0_STALL, /* data or status stages */ |
237 | EP0_SUSPEND, /* usb suspend */ | 239 | EP0_SUSPEND, /* usb suspend */ |
@@ -242,7 +244,7 @@ struct goku_udc { | |||
242 | struct usb_gadget gadget; | 244 | struct usb_gadget gadget; |
243 | spinlock_t lock; | 245 | spinlock_t lock; |
244 | struct goku_ep ep[4]; | 246 | struct goku_ep ep[4]; |
245 | struct usb_gadget_driver *driver; | 247 | struct usb_gadget_driver *driver; |
246 | 248 | ||
247 | enum ep0state ep0state; | 249 | enum ep0state ep0state; |
248 | unsigned got_irq:1, | 250 | unsigned got_irq:1, |