diff options
Diffstat (limited to 'drivers/usb/gadget/pxa25x_udc.h')
-rw-r--r-- | drivers/usb/gadget/pxa25x_udc.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/drivers/usb/gadget/pxa25x_udc.h b/drivers/usb/gadget/pxa25x_udc.h index f572c5617462..8eaf4e43726b 100644 --- a/drivers/usb/gadget/pxa25x_udc.h +++ b/drivers/usb/gadget/pxa25x_udc.h | |||
@@ -9,15 +9,6 @@ | |||
9 | * it under the terms of the GNU General Public License as published by | 9 | * it under the terms of the GNU General Public License as published by |
10 | * the Free Software Foundation; either version 2 of the License, or | 10 | * the Free Software Foundation; either version 2 of the License, or |
11 | * (at your option) any later version. | 11 | * (at your option) any later version. |
12 | * | ||
13 | * This program is distributed in the hope that it will be useful, | ||
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
16 | * GNU General Public License for more details. | ||
17 | * | ||
18 | * You should have received a copy of the GNU General Public License | ||
19 | * along with this program; if not, write to the Free Software | ||
20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
21 | */ | 12 | */ |
22 | 13 | ||
23 | #ifndef __LINUX_USB_GADGET_PXA25X_H | 14 | #ifndef __LINUX_USB_GADGET_PXA25X_H |
@@ -161,8 +152,6 @@ static struct pxa25x_udc *the_controller; | |||
161 | 152 | ||
162 | #ifdef DEBUG | 153 | #ifdef DEBUG |
163 | 154 | ||
164 | static int is_vbus_present(void); | ||
165 | |||
166 | static const char *state_name[] = { | 155 | static const char *state_name[] = { |
167 | "EP0_IDLE", | 156 | "EP0_IDLE", |
168 | "EP0_IN_DATA_PHASE", "EP0_OUT_DATA_PHASE", | 157 | "EP0_IN_DATA_PHASE", "EP0_OUT_DATA_PHASE", |
@@ -214,8 +203,7 @@ dump_state(struct pxa25x_udc *dev) | |||
214 | u32 tmp; | 203 | u32 tmp; |
215 | unsigned i; | 204 | unsigned i; |
216 | 205 | ||
217 | 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", |
218 | is_vbus_present() ? "host " : "disconnected", | ||
219 | state_name[dev->ep0state], | 207 | state_name[dev->ep0state], |
220 | UICR1, UICR0, USIR1, USIR0, UFNRH, UFNRL); | 208 | UICR1, UICR0, USIR1, USIR0, UFNRH, UFNRL); |
221 | dump_udccr("udccr"); | 209 | dump_udccr("udccr"); |
@@ -232,9 +220,6 @@ dump_state(struct pxa25x_udc *dev) | |||
232 | } else | 220 | } else |
233 | DMSG("ep0 driver '%s'\n", dev->driver->driver.name); | 221 | DMSG("ep0 driver '%s'\n", dev->driver->driver.name); |
234 | 222 | ||
235 | if (!is_vbus_present()) | ||
236 | return; | ||
237 | |||
238 | dump_udccs0 ("udccs0"); | 223 | dump_udccs0 ("udccs0"); |
239 | DMSG("ep0 IN %lu/%lu, OUT %lu/%lu\n", | 224 | DMSG("ep0 IN %lu/%lu, OUT %lu/%lu\n", |
240 | dev->stats.write.bytes, dev->stats.write.ops, | 225 | dev->stats.write.bytes, dev->stats.write.ops, |