Skip to content

Commit ab81109

Browse files
committed
Revert "MT-134856: Silence noisy console messages (nxp-imx#29)"
This reverts commit bbe0e38.
1 parent 4693f19 commit ab81109

File tree

4 files changed

+0
-10
lines changed

4 files changed

+0
-10
lines changed

drivers/usb/chipidea/otg.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,8 @@ static int hw_wait_vbus_lower_bsv(struct ci_hdrc *ci)
155155

156156
while (hw_read_otgsc(ci, mask)) {
157157
if (time_after(jiffies, elapse)) {
158-
#ifdef MT_DEBUG
159158
dev_err(ci->dev, "timeout waiting for %08x in OTGSC\n",
160159
mask);
161-
#endif
162160
return -ETIMEDOUT;
163161
}
164162
msleep(20);

drivers/usb/chipidea/usbmisc_imx.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -871,9 +871,7 @@ static int imx7d_charger_detection(struct imx_usbmisc_data *data)
871871
/* Check if vbus is valid */
872872
val = readl(usbmisc->base + MX7D_USB_OTG_PHY_STATUS);
873873
if (!(val & MX7D_USB_OTG_PHY_STATUS_VBUS_VLD)) {
874-
#ifdef MT_DEBUG
875874
dev_err(data->dev, "vbus is error\n");
876-
#endif
877875
return -EINVAL;
878876
}
879877

@@ -1243,11 +1241,9 @@ int imx_usbmisc_charger_detection(struct imx_usbmisc_data *data, bool connect)
12431241
if (connect) {
12441242
ret = usbmisc->ops->charger_detection(data);
12451243
if (ret) {
1246-
#ifdef MT_DEBUG
12471244
dev_err(data->dev,
12481245
"Error occurs during detection: %d\n",
12491246
ret);
1250-
#endif
12511247
usb_phy->chg_state = USB_CHARGER_ABSENT;
12521248
} else {
12531249
usb_phy->chg_state = USB_CHARGER_PRESENT;

drivers/usb/core/hcd.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2943,9 +2943,7 @@ int usb_add_hcd(struct usb_hcd *hcd,
29432943
hcd->state = HC_STATE_RUNNING;
29442944
retval = hcd->driver->start(hcd);
29452945
if (retval < 0) {
2946-
#ifdef MT_DEBUG
29472946
dev_err(hcd->self.controller, "startup error %d\n", retval);
2948-
#endif
29492947
goto err_hcd_driver_start;
29502948
}
29512949

drivers/usb/host/ehci-hcd.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -649,10 +649,8 @@ static int ehci_run (struct usb_hcd *hcd)
649649
up_write(&ehci_cf_port_reset_rwsem);
650650

651651
if (rc) {
652-
#ifdef MT_DEBUG
653652
ehci_err(ehci, "USB %x.%x, controller refused to start: %d\n",
654653
((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f), rc);
655-
#endif
656654
return rc;
657655
}
658656

0 commit comments

Comments
 (0)