From a0e5b98c2755384e9f1a6c9e5fd51c63751b2f40 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Wed, 19 Sep 2007 12:50:05 -0700 Subject: [PATCH] musb_hdrc: Remove non-debug otg_state_string The right state information via sys is good to know, don't try to optimize it away. Signed-off-by: Tony Lindgren --- drivers/usb/musb/musb_core.c | 29 ++++++++++++++++++++--------- drivers/usb/musb/musb_procfs.c | 21 --------------------- 2 files changed, 20 insertions(+), 30 deletions(-) diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 82bf57af4ef..b43803602f3 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -121,15 +121,6 @@ module_param(debug, uint, 0); MODULE_PARM_DESC(debug, "initial debug message level"); #define MUSB_VERSION_SUFFIX "/dbg" -#else - -const char *otg_state_string(struct musb *musb) -{ - static char buf[8]; - - snprintf(buf, sizeof buf, "otg-%d", musb->xceiv.state); - return buf; -} #endif #define DRIVER_AUTHOR "Mentor Graphics, Texas Instruments, Nokia" @@ -281,6 +272,26 @@ void musb_load_testpacket(struct musb *musb) /*-------------------------------------------------------------------------*/ +const char *otg_state_string(struct musb *musb) +{ + switch (musb->xceiv.state) { + case OTG_STATE_A_IDLE: return "a_idle"; + case OTG_STATE_A_WAIT_VRISE: return "a_wait_vrise"; + case OTG_STATE_A_WAIT_BCON: return "a_wait_bcon"; + case OTG_STATE_A_HOST: return "a_host"; + case OTG_STATE_A_SUSPEND: return "a_suspend"; + case OTG_STATE_A_PERIPHERAL: return "a_peripheral"; + case OTG_STATE_A_WAIT_VFALL: return "a_wait_vfall"; + case OTG_STATE_A_VBUS_ERR: return "a_vbus_err"; + case OTG_STATE_B_IDLE: return "b_idle"; + case OTG_STATE_B_SRP_INIT: return "b_srp_init"; + case OTG_STATE_B_PERIPHERAL: return "b_peripheral"; + case OTG_STATE_B_WAIT_ACON: return "b_wait_acon"; + case OTG_STATE_B_HOST: return "b_host"; + default: return "UNDEFINED"; + } +} + #ifdef CONFIG_USB_MUSB_OTG /* diff --git a/drivers/usb/musb/musb_procfs.c b/drivers/usb/musb/musb_procfs.c index ca53d13797d..bd282da5b1b 100644 --- a/drivers/usb/musb/musb_procfs.c +++ b/drivers/usb/musb/musb_procfs.c @@ -42,27 +42,6 @@ #include "davinci.h" - -const char *otg_state_string(struct musb *musb) -{ - switch (musb->xceiv.state) { - case OTG_STATE_A_IDLE: return "a_idle"; - case OTG_STATE_A_WAIT_VRISE: return "a_wait_vrise"; - case OTG_STATE_A_WAIT_BCON: return "a_wait_bcon"; - case OTG_STATE_A_HOST: return "a_host"; - case OTG_STATE_A_SUSPEND: return "a_suspend"; - case OTG_STATE_A_PERIPHERAL: return "a_peripheral"; - case OTG_STATE_A_WAIT_VFALL: return "a_wait_vfall"; - case OTG_STATE_A_VBUS_ERR: return "a_vbus_err"; - case OTG_STATE_B_IDLE: return "b_idle"; - case OTG_STATE_B_SRP_INIT: return "b_srp_init"; - case OTG_STATE_B_PERIPHERAL: return "b_peripheral"; - case OTG_STATE_B_WAIT_ACON: return "b_wait_acon"; - case OTG_STATE_B_HOST: return "b_host"; - default: return "UNDEFINED"; - } -} - #ifdef CONFIG_USB_MUSB_HDRC_HCD static int dump_qh(struct musb_qh *qh, char *buf, unsigned max) -- 2.41.1