Commit 057715f2 authored by Paul Zimmerman's avatar Paul Zimmerman Committed by Greg Kroah-Hartman

staging: dwc2: rename dwc2_check_core_status()

Rename dwc2_check_core_status() to dwc2_is_controller_alive(), and
make it a boolean function. Also change the message when the
controller is dead to say "dead" instead of "disconnected".
Signed-off-by: default avatarPaul Zimmerman <paulz@synopsys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b66a3f05
...@@ -2736,12 +2736,12 @@ u16 dwc2_get_otg_version(struct dwc2_hsotg *hsotg) ...@@ -2736,12 +2736,12 @@ u16 dwc2_get_otg_version(struct dwc2_hsotg *hsotg)
return hsotg->core_params->otg_ver == 1 ? 0x0200 : 0x0103; return hsotg->core_params->otg_ver == 1 ? 0x0200 : 0x0103;
} }
int dwc2_check_core_status(struct dwc2_hsotg *hsotg) bool dwc2_is_controller_alive(struct dwc2_hsotg *hsotg)
{ {
if (readl(hsotg->regs + GSNPSID) == 0xffffffff) if (readl(hsotg->regs + GSNPSID) == 0xffffffff)
return -1; return false;
else else
return 0; return true;
} }
/** /**
......
...@@ -544,7 +544,7 @@ extern void dwc2_enable_host_interrupts(struct dwc2_hsotg *hsotg); ...@@ -544,7 +544,7 @@ extern void dwc2_enable_host_interrupts(struct dwc2_hsotg *hsotg);
extern void dwc2_disable_host_interrupts(struct dwc2_hsotg *hsotg); extern void dwc2_disable_host_interrupts(struct dwc2_hsotg *hsotg);
extern u32 dwc2_calc_frame_interval(struct dwc2_hsotg *hsotg); extern u32 dwc2_calc_frame_interval(struct dwc2_hsotg *hsotg);
extern int dwc2_check_core_status(struct dwc2_hsotg *hsotg); extern bool dwc2_is_controller_alive(struct dwc2_hsotg *hsotg);
/* /*
* Common core Functions. * Common core Functions.
......
...@@ -451,8 +451,8 @@ irqreturn_t dwc2_handle_common_intr(int irq, void *dev) ...@@ -451,8 +451,8 @@ irqreturn_t dwc2_handle_common_intr(int irq, void *dev)
u32 gintsts; u32 gintsts;
irqreturn_t retval = IRQ_NONE; irqreturn_t retval = IRQ_NONE;
if (dwc2_check_core_status(hsotg) < 0) { if (!dwc2_is_controller_alive(hsotg)) {
dev_warn(hsotg->dev, "Controller is disconnected\n"); dev_warn(hsotg->dev, "Controller is dead\n");
goto out; goto out;
} }
......
...@@ -2059,8 +2059,8 @@ irqreturn_t dwc2_handle_hcd_intr(struct dwc2_hsotg *hsotg) ...@@ -2059,8 +2059,8 @@ irqreturn_t dwc2_handle_hcd_intr(struct dwc2_hsotg *hsotg)
u32 gintsts, dbg_gintsts; u32 gintsts, dbg_gintsts;
irqreturn_t retval = IRQ_NONE; irqreturn_t retval = IRQ_NONE;
if (dwc2_check_core_status(hsotg) < 0) { if (!dwc2_is_controller_alive(hsotg) < 0) {
dev_warn(hsotg->dev, "Controller is disconnected\n"); dev_warn(hsotg->dev, "Controller is dead\n");
return retval; return retval;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment