mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-27 22:51:31 +00:00
usb: musb: Add and use inline function musb_otg_state_string
The musb_otg_state_string() simply calls usb_otg_state_string(). This will make it easier to get rid of the musb->xceiv dependency later. Signed-off-by: Paul Cercueil <paul@crapouillou.net> Link: https://lore.kernel.org/r/20221026182657.146630-3-paul@crapouillou.net Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
21acc656a0
commit
285f28bfed
5 changed files with 31 additions and 31 deletions
|
@ -610,13 +610,13 @@ static void musb_otg_timer_func(struct timer_list *t)
|
||||||
case OTG_STATE_A_SUSPEND:
|
case OTG_STATE_A_SUSPEND:
|
||||||
case OTG_STATE_A_WAIT_BCON:
|
case OTG_STATE_A_WAIT_BCON:
|
||||||
musb_dbg(musb, "HNP: %s timeout",
|
musb_dbg(musb, "HNP: %s timeout",
|
||||||
usb_otg_state_string(musb->xceiv->otg->state));
|
musb_otg_state_string(musb));
|
||||||
musb_platform_set_vbus(musb, 0);
|
musb_platform_set_vbus(musb, 0);
|
||||||
musb_set_state(musb, OTG_STATE_A_WAIT_VFALL);
|
musb_set_state(musb, OTG_STATE_A_WAIT_VFALL);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
musb_dbg(musb, "HNP: Unhandled mode %s",
|
musb_dbg(musb, "HNP: Unhandled mode %s",
|
||||||
usb_otg_state_string(musb->xceiv->otg->state));
|
musb_otg_state_string(musb));
|
||||||
}
|
}
|
||||||
spin_unlock_irqrestore(&musb->lock, flags);
|
spin_unlock_irqrestore(&musb->lock, flags);
|
||||||
}
|
}
|
||||||
|
@ -630,14 +630,12 @@ void musb_hnp_stop(struct musb *musb)
|
||||||
void __iomem *mbase = musb->mregs;
|
void __iomem *mbase = musb->mregs;
|
||||||
u8 reg;
|
u8 reg;
|
||||||
|
|
||||||
musb_dbg(musb, "HNP: stop from %s",
|
musb_dbg(musb, "HNP: stop from %s", musb_otg_state_string(musb));
|
||||||
usb_otg_state_string(musb->xceiv->otg->state));
|
|
||||||
|
|
||||||
switch (musb_get_state(musb)) {
|
switch (musb_get_state(musb)) {
|
||||||
case OTG_STATE_A_PERIPHERAL:
|
case OTG_STATE_A_PERIPHERAL:
|
||||||
musb_g_disconnect(musb);
|
musb_g_disconnect(musb);
|
||||||
musb_dbg(musb, "HNP: back to %s",
|
musb_dbg(musb, "HNP: back to %s", musb_otg_state_string(musb));
|
||||||
usb_otg_state_string(musb->xceiv->otg->state));
|
|
||||||
break;
|
break;
|
||||||
case OTG_STATE_B_HOST:
|
case OTG_STATE_B_HOST:
|
||||||
musb_dbg(musb, "HNP: Disabling HR");
|
musb_dbg(musb, "HNP: Disabling HR");
|
||||||
|
@ -652,7 +650,7 @@ void musb_hnp_stop(struct musb *musb)
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
musb_dbg(musb, "HNP: Stopping in unknown state %s",
|
musb_dbg(musb, "HNP: Stopping in unknown state %s",
|
||||||
usb_otg_state_string(musb->xceiv->otg->state));
|
musb_otg_state_string(musb));
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -667,8 +665,7 @@ static void musb_recover_from_babble(struct musb *musb);
|
||||||
|
|
||||||
static void musb_handle_intr_resume(struct musb *musb, u8 devctl)
|
static void musb_handle_intr_resume(struct musb *musb, u8 devctl)
|
||||||
{
|
{
|
||||||
musb_dbg(musb, "RESUME (%s)",
|
musb_dbg(musb, "RESUME (%s)", musb_otg_state_string(musb));
|
||||||
usb_otg_state_string(musb->xceiv->otg->state));
|
|
||||||
|
|
||||||
if (devctl & MUSB_DEVCTL_HM) {
|
if (devctl & MUSB_DEVCTL_HM) {
|
||||||
switch (musb_get_state(musb)) {
|
switch (musb_get_state(musb)) {
|
||||||
|
@ -693,7 +690,7 @@ static void musb_handle_intr_resume(struct musb *musb, u8 devctl)
|
||||||
default:
|
default:
|
||||||
WARNING("bogus %s RESUME (%s)\n",
|
WARNING("bogus %s RESUME (%s)\n",
|
||||||
"host",
|
"host",
|
||||||
usb_otg_state_string(musb->xceiv->otg->state));
|
musb_otg_state_string(musb));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
switch (musb_get_state(musb)) {
|
switch (musb_get_state(musb)) {
|
||||||
|
@ -722,7 +719,7 @@ static void musb_handle_intr_resume(struct musb *musb, u8 devctl)
|
||||||
default:
|
default:
|
||||||
WARNING("bogus %s RESUME (%s)\n",
|
WARNING("bogus %s RESUME (%s)\n",
|
||||||
"peripheral",
|
"peripheral",
|
||||||
usb_otg_state_string(musb->xceiv->otg->state));
|
musb_otg_state_string(musb));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -738,8 +735,7 @@ static irqreturn_t musb_handle_intr_sessreq(struct musb *musb, u8 devctl)
|
||||||
return IRQ_HANDLED;
|
return IRQ_HANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
musb_dbg(musb, "SESSION_REQUEST (%s)",
|
musb_dbg(musb, "SESSION_REQUEST (%s)", musb_otg_state_string(musb));
|
||||||
usb_otg_state_string(musb->xceiv->otg->state));
|
|
||||||
|
|
||||||
/* IRQ arrives from ID pin sense or (later, if VBUS power
|
/* IRQ arrives from ID pin sense or (later, if VBUS power
|
||||||
* is removed) SRP. responses are time critical:
|
* is removed) SRP. responses are time critical:
|
||||||
|
@ -806,7 +802,7 @@ static void musb_handle_intr_vbuserr(struct musb *musb, u8 devctl)
|
||||||
|
|
||||||
dev_printk(ignore ? KERN_DEBUG : KERN_ERR, musb->controller,
|
dev_printk(ignore ? KERN_DEBUG : KERN_ERR, musb->controller,
|
||||||
"VBUS_ERROR in %s (%02x, %s), retry #%d, port1 %08x\n",
|
"VBUS_ERROR in %s (%02x, %s), retry #%d, port1 %08x\n",
|
||||||
usb_otg_state_string(musb->xceiv->otg->state),
|
musb_otg_state_string(musb),
|
||||||
devctl,
|
devctl,
|
||||||
({ char *s;
|
({ char *s;
|
||||||
switch (devctl & MUSB_DEVCTL_VBUS) {
|
switch (devctl & MUSB_DEVCTL_VBUS) {
|
||||||
|
@ -831,7 +827,7 @@ static void musb_handle_intr_vbuserr(struct musb *musb, u8 devctl)
|
||||||
static void musb_handle_intr_suspend(struct musb *musb, u8 devctl)
|
static void musb_handle_intr_suspend(struct musb *musb, u8 devctl)
|
||||||
{
|
{
|
||||||
musb_dbg(musb, "SUSPEND (%s) devctl %02x",
|
musb_dbg(musb, "SUSPEND (%s) devctl %02x",
|
||||||
usb_otg_state_string(musb->xceiv->otg->state), devctl);
|
musb_otg_state_string(musb), devctl);
|
||||||
|
|
||||||
switch (musb_get_state(musb)) {
|
switch (musb_get_state(musb)) {
|
||||||
case OTG_STATE_A_PERIPHERAL:
|
case OTG_STATE_A_PERIPHERAL:
|
||||||
|
@ -939,13 +935,13 @@ static void musb_handle_intr_connect(struct musb *musb, u8 devctl, u8 int_usb)
|
||||||
musb_host_poke_root_hub(musb);
|
musb_host_poke_root_hub(musb);
|
||||||
|
|
||||||
musb_dbg(musb, "CONNECT (%s) devctl %02x",
|
musb_dbg(musb, "CONNECT (%s) devctl %02x",
|
||||||
usb_otg_state_string(musb->xceiv->otg->state), devctl);
|
musb_otg_state_string(musb), devctl);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void musb_handle_intr_disconnect(struct musb *musb, u8 devctl)
|
static void musb_handle_intr_disconnect(struct musb *musb, u8 devctl)
|
||||||
{
|
{
|
||||||
musb_dbg(musb, "DISCONNECT (%s) as %s, devctl %02x",
|
musb_dbg(musb, "DISCONNECT (%s) as %s, devctl %02x",
|
||||||
usb_otg_state_string(musb->xceiv->otg->state),
|
musb_otg_state_string(musb),
|
||||||
MUSB_MODE(musb), devctl);
|
MUSB_MODE(musb), devctl);
|
||||||
|
|
||||||
switch (musb_get_state(musb)) {
|
switch (musb_get_state(musb)) {
|
||||||
|
@ -981,7 +977,7 @@ static void musb_handle_intr_disconnect(struct musb *musb, u8 devctl)
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
WARNING("unhandled DISCONNECT transition (%s)\n",
|
WARNING("unhandled DISCONNECT transition (%s)\n",
|
||||||
usb_otg_state_string(musb->xceiv->otg->state));
|
musb_otg_state_string(musb));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1004,8 +1000,7 @@ static void musb_handle_intr_reset(struct musb *musb)
|
||||||
dev_err(musb->controller, "Babble\n");
|
dev_err(musb->controller, "Babble\n");
|
||||||
musb_recover_from_babble(musb);
|
musb_recover_from_babble(musb);
|
||||||
} else {
|
} else {
|
||||||
musb_dbg(musb, "BUS RESET as %s",
|
musb_dbg(musb, "BUS RESET as %s", musb_otg_state_string(musb));
|
||||||
usb_otg_state_string(musb->xceiv->otg->state));
|
|
||||||
switch (musb_get_state(musb)) {
|
switch (musb_get_state(musb)) {
|
||||||
case OTG_STATE_A_SUSPEND:
|
case OTG_STATE_A_SUSPEND:
|
||||||
musb_g_reset(musb);
|
musb_g_reset(musb);
|
||||||
|
@ -1013,7 +1008,7 @@ static void musb_handle_intr_reset(struct musb *musb)
|
||||||
case OTG_STATE_A_WAIT_BCON: /* OPT TD.4.7-900ms */
|
case OTG_STATE_A_WAIT_BCON: /* OPT TD.4.7-900ms */
|
||||||
/* never use invalid T(a_wait_bcon) */
|
/* never use invalid T(a_wait_bcon) */
|
||||||
musb_dbg(musb, "HNP: in %s, %d msec timeout",
|
musb_dbg(musb, "HNP: in %s, %d msec timeout",
|
||||||
usb_otg_state_string(musb->xceiv->otg->state),
|
musb_otg_state_string(musb),
|
||||||
TA_WAIT_BCON(musb));
|
TA_WAIT_BCON(musb));
|
||||||
mod_timer(&musb->otg_timer, jiffies
|
mod_timer(&musb->otg_timer, jiffies
|
||||||
+ msecs_to_jiffies(TA_WAIT_BCON(musb)));
|
+ msecs_to_jiffies(TA_WAIT_BCON(musb)));
|
||||||
|
@ -1024,7 +1019,7 @@ static void musb_handle_intr_reset(struct musb *musb)
|
||||||
break;
|
break;
|
||||||
case OTG_STATE_B_WAIT_ACON:
|
case OTG_STATE_B_WAIT_ACON:
|
||||||
musb_dbg(musb, "HNP: RESET (%s), to b_peripheral",
|
musb_dbg(musb, "HNP: RESET (%s), to b_peripheral",
|
||||||
usb_otg_state_string(musb->xceiv->otg->state));
|
musb_otg_state_string(musb));
|
||||||
musb_set_state(musb, OTG_STATE_B_PERIPHERAL);
|
musb_set_state(musb, OTG_STATE_B_PERIPHERAL);
|
||||||
musb_g_reset(musb);
|
musb_g_reset(musb);
|
||||||
break;
|
break;
|
||||||
|
@ -1036,7 +1031,7 @@ static void musb_handle_intr_reset(struct musb *musb)
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
musb_dbg(musb, "Unhandled BUS RESET as %s",
|
musb_dbg(musb, "Unhandled BUS RESET as %s",
|
||||||
usb_otg_state_string(musb->xceiv->otg->state));
|
musb_otg_state_string(musb));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1863,7 +1858,7 @@ mode_show(struct device *dev, struct device_attribute *attr, char *buf)
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
spin_lock_irqsave(&musb->lock, flags);
|
spin_lock_irqsave(&musb->lock, flags);
|
||||||
ret = sprintf(buf, "%s\n", usb_otg_state_string(musb->xceiv->otg->state));
|
ret = sprintf(buf, "%s\n", musb_otg_state_string(musb));
|
||||||
spin_unlock_irqrestore(&musb->lock, flags);
|
spin_unlock_irqrestore(&musb->lock, flags);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
|
|
@ -603,6 +603,11 @@ static inline enum usb_otg_state musb_get_state(struct musb *musb)
|
||||||
return musb->xceiv->otg->state;
|
return musb->xceiv->otg->state;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline const char *musb_otg_state_string(struct musb *musb)
|
||||||
|
{
|
||||||
|
return usb_otg_state_string(musb_get_state(musb));
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* gets the "dr_mode" property from DT and converts it into musb_mode
|
* gets the "dr_mode" property from DT and converts it into musb_mode
|
||||||
* if the property is not found or not recognized returns MUSB_OTG
|
* if the property is not found or not recognized returns MUSB_OTG
|
||||||
|
|
|
@ -1564,7 +1564,7 @@ static int musb_gadget_wakeup(struct usb_gadget *gadget)
|
||||||
goto done;
|
goto done;
|
||||||
default:
|
default:
|
||||||
musb_dbg(musb, "Unhandled wake: %s",
|
musb_dbg(musb, "Unhandled wake: %s",
|
||||||
usb_otg_state_string(musb->xceiv->otg->state));
|
musb_otg_state_string(musb));
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1940,7 +1940,7 @@ void musb_g_resume(struct musb *musb)
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
WARNING("unhandled RESUME transition (%s)\n",
|
WARNING("unhandled RESUME transition (%s)\n",
|
||||||
usb_otg_state_string(musb->xceiv->otg->state));
|
musb_otg_state_string(musb));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1970,7 +1970,7 @@ void musb_g_suspend(struct musb *musb)
|
||||||
* A_PERIPHERAL may need care too
|
* A_PERIPHERAL may need care too
|
||||||
*/
|
*/
|
||||||
WARNING("unhandled SUSPEND transition (%s)",
|
WARNING("unhandled SUSPEND transition (%s)",
|
||||||
usb_otg_state_string(musb->xceiv->otg->state));
|
musb_otg_state_string(musb));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2004,7 +2004,7 @@ void musb_g_disconnect(struct musb *musb)
|
||||||
switch (musb_get_state(musb)) {
|
switch (musb_get_state(musb)) {
|
||||||
default:
|
default:
|
||||||
musb_dbg(musb, "Unhandled disconnect %s, setting a_idle",
|
musb_dbg(musb, "Unhandled disconnect %s, setting a_idle",
|
||||||
usb_otg_state_string(musb->xceiv->otg->state));
|
musb_otg_state_string(musb));
|
||||||
musb_set_state(musb, OTG_STATE_A_IDLE);
|
musb_set_state(musb, OTG_STATE_A_IDLE);
|
||||||
MUSB_HST_MODE(musb);
|
MUSB_HST_MODE(musb);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -2519,7 +2519,7 @@ static int musb_bus_suspend(struct usb_hcd *hcd)
|
||||||
|
|
||||||
if (musb->is_active) {
|
if (musb->is_active) {
|
||||||
WARNING("trying to suspend as %s while active\n",
|
WARNING("trying to suspend as %s while active\n",
|
||||||
usb_otg_state_string(musb->xceiv->otg->state));
|
musb_otg_state_string(musb));
|
||||||
return -EBUSY;
|
return -EBUSY;
|
||||||
} else
|
} else
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -102,7 +102,7 @@ int musb_port_suspend(struct musb *musb, bool do_suspend)
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
musb_dbg(musb, "bogus rh suspend? %s",
|
musb_dbg(musb, "bogus rh suspend? %s",
|
||||||
usb_otg_state_string(musb->xceiv->otg->state));
|
musb_otg_state_string(musb));
|
||||||
}
|
}
|
||||||
} else if (power & MUSB_POWER_SUSPENDM) {
|
} else if (power & MUSB_POWER_SUSPENDM) {
|
||||||
power &= ~MUSB_POWER_SUSPENDM;
|
power &= ~MUSB_POWER_SUSPENDM;
|
||||||
|
@ -221,7 +221,7 @@ void musb_root_disconnect(struct musb *musb)
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
musb_dbg(musb, "host disconnect (%s)",
|
musb_dbg(musb, "host disconnect (%s)",
|
||||||
usb_otg_state_string(musb->xceiv->otg->state));
|
musb_otg_state_string(musb));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(musb_root_disconnect);
|
EXPORT_SYMBOL_GPL(musb_root_disconnect);
|
||||||
|
|
Loading…
Reference in a new issue