diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-01 16:03:33 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2011-10-13 13:39:53 -0400 |
commit | d5546b380583f009bc18504e7f946fa16d861381 (patch) | |
tree | bc89beaff9c43e00f2457ae93424ed4aa23e8e9d /drivers/usb/gadget | |
parent | fe69676530f182bbb1fe0edd027e18751a1a2595 (diff) |
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')
-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 4634cd361f29..8eaf4e43726b 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; | |||
152 | 152 | ||
153 | #ifdef DEBUG | 153 | #ifdef DEBUG |
154 | 154 | ||
155 | static int is_vbus_present(void); | ||
156 | |||
157 | static const char *state_name[] = { | 155 | static const char *state_name[] = { |
158 | "EP0_IDLE", | 156 | "EP0_IDLE", |
159 | "EP0_IN_DATA_PHASE", "EP0_OUT_DATA_PHASE", | 157 | "EP0_IN_DATA_PHASE", "EP0_OUT_DATA_PHASE", |
@@ -205,8 +203,7 @@ dump_state(struct pxa25x_udc *dev) | |||
205 | u32 tmp; | 203 | u32 tmp; |
206 | unsigned i; | 204 | unsigned i; |
207 | 205 | ||
208 | DMSG("%s %s, uicr %02X.%02X, usir %02X.%02x, ufnr %02X.%02X\n", | 206 | DMSG("%s, uicr %02X.%02X, usir %02X.%02x, ufnr %02X.%02X\n", |
209 | is_vbus_present() ? "host " : "disconnected", | ||
210 | state_name[dev->ep0state], | 207 | state_name[dev->ep0state], |
211 | UICR1, UICR0, USIR1, USIR0, UFNRH, UFNRL); | 208 | UICR1, UICR0, USIR1, USIR0, UFNRH, UFNRL); |
212 | dump_udccr("udccr"); | 209 | dump_udccr("udccr"); |
@@ -223,9 +220,6 @@ dump_state(struct pxa25x_udc *dev) | |||
223 | } else | 220 | } else |
224 | DMSG("ep0 driver '%s'\n", dev->driver->driver.name); | 221 | DMSG("ep0 driver '%s'\n", dev->driver->driver.name); |
225 | 222 | ||
226 | if (!is_vbus_present()) | ||
227 | return; | ||
228 | |||
229 | dump_udccs0 ("udccs0"); | 223 | dump_udccs0 ("udccs0"); |
230 | DMSG("ep0 IN %lu/%lu, OUT %lu/%lu\n", | 224 | DMSG("ep0 IN %lu/%lu, OUT %lu/%lu\n", |
231 | dev->stats.write.bytes, dev->stats.write.ops, | 225 | dev->stats.write.bytes, dev->stats.write.ops, |