mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
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>
This commit is contained in:
parent
70790f6339
commit
2d70c99b93
2 changed files with 23 additions and 23 deletions
|
@ -20,7 +20,6 @@
|
|||
* - DMA works with ep1 (OUT transfers) and ep2 (IN transfers).
|
||||
*/
|
||||
|
||||
#undef DEBUG
|
||||
// #define VERBOSE /* extra debug messages (success too) */
|
||||
// #define USB_TRACE /* packet-level success messages */
|
||||
|
||||
|
@ -440,7 +439,7 @@ static int read_fifo(struct goku_ep *ep, struct goku_request *req)
|
|||
/* use ep1/ep2 double-buffering for OUT */
|
||||
if (!(size & PACKET_ACTIVE))
|
||||
size = readl(®s->EPxSizeLB[ep->num]);
|
||||
if (!(size & PACKET_ACTIVE)) // "can't happen"
|
||||
if (!(size & PACKET_ACTIVE)) /* "can't happen" */
|
||||
break;
|
||||
size &= DATASIZE; /* EPxSizeH == 0 */
|
||||
|
||||
|
@ -1092,17 +1091,17 @@ udc_proc_read(char *buffer, char **start, off_t off, int count,
|
|||
is_usb_connected
|
||||
? ((tmp & PW_PULLUP) ? "full speed" : "powered")
|
||||
: "disconnected",
|
||||
({char *tmp;
|
||||
({char *state;
|
||||
switch(dev->ep0state){
|
||||
case EP0_DISCONNECT: tmp = "ep0_disconnect"; break;
|
||||
case EP0_IDLE: tmp = "ep0_idle"; break;
|
||||
case EP0_IN: tmp = "ep0_in"; break;
|
||||
case EP0_OUT: tmp = "ep0_out"; break;
|
||||
case EP0_STATUS: tmp = "ep0_status"; break;
|
||||
case EP0_STALL: tmp = "ep0_stall"; break;
|
||||
case EP0_SUSPEND: tmp = "ep0_suspend"; break;
|
||||
default: tmp = "ep0_?"; break;
|
||||
} tmp; })
|
||||
case EP0_DISCONNECT: state = "ep0_disconnect"; break;
|
||||
case EP0_IDLE: state = "ep0_idle"; break;
|
||||
case EP0_IN: state = "ep0_in"; break;
|
||||
case EP0_OUT: state = "ep0_out"; break;
|
||||
case EP0_STATUS: state = "ep0_status"; break;
|
||||
case EP0_STALL: state = "ep0_stall"; break;
|
||||
case EP0_SUSPEND: state = "ep0_suspend"; break;
|
||||
default: state = "ep0_?"; break;
|
||||
} state; })
|
||||
);
|
||||
size -= t;
|
||||
next += t;
|
||||
|
@ -1147,7 +1146,6 @@ udc_proc_read(char *buffer, char **start, off_t off, int count,
|
|||
for (i = 0; i < 4; i++) {
|
||||
struct goku_ep *ep = &dev->ep [i];
|
||||
struct goku_request *req;
|
||||
int t;
|
||||
|
||||
if (i && !ep->desc)
|
||||
continue;
|
||||
|
@ -1235,7 +1233,7 @@ udc_proc_read(char *buffer, char **start, off_t off, int count,
|
|||
static void udc_reinit (struct goku_udc *dev)
|
||||
{
|
||||
static char *names [] = { "ep0", "ep1-bulk", "ep2-bulk", "ep3-bulk" };
|
||||
|
||||
|
||||
unsigned i;
|
||||
|
||||
INIT_LIST_HEAD (&dev->gadget.ep_list);
|
||||
|
@ -1848,9 +1846,9 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
|||
|
||||
/* done */
|
||||
the_controller = dev;
|
||||
device_register(&dev->gadget.dev);
|
||||
|
||||
return 0;
|
||||
retval = device_register(&dev->gadget.dev);
|
||||
if (retval == 0)
|
||||
return 0;
|
||||
|
||||
done:
|
||||
if (dev)
|
||||
|
@ -1862,8 +1860,8 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
|||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
static struct pci_device_id pci_ids [] = { {
|
||||
.class = ((PCI_CLASS_SERIAL_USB << 8) | 0xfe),
|
||||
.class_mask = ~0,
|
||||
.class = ((PCI_CLASS_SERIAL_USB << 8) | 0xfe),
|
||||
.class_mask = ~0,
|
||||
.vendor = 0x102f, /* Toshiba */
|
||||
.device = 0x0107, /* this UDC */
|
||||
.subvendor = PCI_ANY_ID,
|
||||
|
|
|
@ -41,8 +41,10 @@ struct goku_udc_regs {
|
|||
#define INT_SYSERROR 0x40000
|
||||
#define INT_PWRDETECT 0x80000
|
||||
|
||||
#define INT_DEVWIDE (INT_PWRDETECT|INT_SYSERROR/*|INT_ERR*/|INT_USBRESET|INT_SUSPEND)
|
||||
#define INT_EP0 (INT_SETUP|INT_ENDPOINT0/*|INT_STATUS*/|INT_STATUSNAK)
|
||||
#define INT_DEVWIDE \
|
||||
(INT_PWRDETECT|INT_SYSERROR/*|INT_ERR*/|INT_USBRESET|INT_SUSPEND)
|
||||
#define INT_EP0 \
|
||||
(INT_SETUP|INT_ENDPOINT0/*|INT_STATUS*/|INT_STATUSNAK)
|
||||
|
||||
u32 dma_master;
|
||||
#define MST_EOPB_DIS 0x0800
|
||||
|
@ -231,7 +233,7 @@ struct goku_request {
|
|||
enum ep0state {
|
||||
EP0_DISCONNECT, /* no host */
|
||||
EP0_IDLE, /* between STATUS ack and SETUP report */
|
||||
EP0_IN, EP0_OUT, /* data stage */
|
||||
EP0_IN, EP0_OUT, /* data stage */
|
||||
EP0_STATUS, /* status stage */
|
||||
EP0_STALL, /* data or status stages */
|
||||
EP0_SUSPEND, /* usb suspend */
|
||||
|
@ -242,7 +244,7 @@ struct goku_udc {
|
|||
struct usb_gadget gadget;
|
||||
spinlock_t lock;
|
||||
struct goku_ep ep[4];
|
||||
struct usb_gadget_driver *driver;
|
||||
struct usb_gadget_driver *driver;
|
||||
|
||||
enum ep0state ep0state;
|
||||
unsigned got_irq:1,
|
||||
|
|
Loading…
Reference in a new issue