diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-01 22:03:33 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2011-10-13 20:39:53 +0300 |
| commit | d5546b380583f009bc18504e7f946fa16d861381 (patch) | |
| tree | bc89beaff9c43e00f2457ae93424ed4aa23e8e9d /drivers/usb/gadget/pxa25x_udc.h | |
| parent | fe69676530f182bbb1fe0edd027e18751a1a2595 (diff) | |
| download | kernel_goldelico_gta04-d5546b380583f009bc18504e7f946fa16d861381.zip kernel_goldelico_gta04-d5546b380583f009bc18504e7f946fa16d861381.tar.gz kernel_goldelico_gta04-d5546b380583f009bc18504e7f946fa16d861381.tar.bz2 | |
usb: gadget: pxa25x: is_vbus_present is gone
A recent commit obsoleted the is_vbus_present function, so
we must not use it any more.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/pxa25x_udc.h')
| -rw-r--r-- | drivers/usb/gadget/pxa25x_udc.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/usb/gadget/pxa25x_udc.h b/drivers/usb/gadget/pxa25x_udc.h index 4634cd3..8eaf4e4 100644 --- a/drivers/usb/gadget/pxa25x_udc.h +++ b/drivers/usb/gadget/pxa25x_udc.h @@ -152,8 +152,6 @@ static struct pxa25x_udc *the_controller; #ifdef DEBUG -static int is_vbus_present(void); - static const char *state_name[] = { "EP0_IDLE", "EP0_IN_DATA_PHASE", "EP0_OUT_DATA_PHASE", @@ -205,8 +203,7 @@ dump_state(struct pxa25x_udc *dev) u32 tmp; unsigned i; - DMSG("%s %s, uicr %02X.%02X, usir %02X.%02x, ufnr %02X.%02X\n", - is_vbus_present() ? "host " : "disconnected", + DMSG("%s, uicr %02X.%02X, usir %02X.%02x, ufnr %02X.%02X\n", state_name[dev->ep0state], UICR1, UICR0, USIR1, USIR0, UFNRH, UFNRL); dump_udccr("udccr"); @@ -223,9 +220,6 @@ dump_state(struct pxa25x_udc *dev) } else DMSG("ep0 driver '%s'\n", dev->driver->driver.name); - if (!is_vbus_present()) - return; - dump_udccs0 ("udccs0"); DMSG("ep0 IN %lu/%lu, OUT %lu/%lu\n", dev->stats.write.bytes, dev->stats.write.ops, |