usb: gadget: ci13xxx: replace home-brewed logging with dev_{err,warn,info}
Logging output in the driver is mostly done using custom err/warn/info
macros which rely on the existence of the global variable _udc, which
is a global reference to the udc controller structure. This reference
will have to go in order to allow us to have more than one chipidea udc
in the system.
Thus, replace custom macros with dev_{err,warn,info} using the platform
device where possible. The trace() macro, which is a nop by default is
left for tracing purposes.
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/usb/gadget/ci13xxx_udc.c b/drivers/usb/gadget/ci13xxx_udc.c
index 009a3cd..ce50af9 100644
--- a/drivers/usb/gadget/ci13xxx_udc.c
+++ b/drivers/usb/gadget/ci13xxx_udc.c
@@ -781,9 +781,9 @@
struct usb_gadget *gadget = &udc->gadget;
int n = 0;
- dbg_trace("[%s] %p\n", __func__, buf);
+ trace(udc->dev, "%p\n", buf);
if (attr == NULL || buf == NULL) {
- dev_err(dev, "[%s] EINVAL\n", __func__);
+ dev_err(udc->dev, "[%s] EINVAL\n", __func__);
return 0;
}
@@ -823,7 +823,7 @@
struct usb_gadget_driver *driver = udc->driver;
int n = 0;
- dbg_trace("[%s] %p\n", __func__, buf);
+ trace(udc->dev, "%p\n", buf);
if (attr == NULL || buf == NULL) {
dev_err(dev, "[%s] EINVAL\n", __func__);
return 0;
@@ -984,9 +984,9 @@
unsigned long flags;
unsigned i, j, n = 0;
- dbg_trace("[%s] %p\n", __func__, buf);
+ trace(dev->parent, "%p\n", buf);
if (attr == NULL || buf == NULL) {
- dev_err(dev, "[%s] EINVAL\n", __func__);
+ dev_err(dev->parent, "[%s] EINVAL\n", __func__);
return 0;
}
@@ -1019,7 +1019,7 @@
{
unsigned tty;
- dbg_trace("[%s] %p, %d\n", __func__, buf, count);
+ trace(dev->parent, "[%s] %p, %d\n", __func__, buf, count);
if (attr == NULL || buf == NULL) {
dev_err(dev, "[%s] EINVAL\n", __func__);
goto done;
@@ -1051,9 +1051,9 @@
u32 intr;
unsigned i, j, n = 0;
- dbg_trace("[%s] %p\n", __func__, buf);
+ trace(udc->dev, "%p\n", buf);
if (attr == NULL || buf == NULL) {
- dev_err(dev, "[%s] EINVAL\n", __func__);
+ dev_err(udc->dev, "[%s] EINVAL\n", __func__);
return 0;
}
@@ -1124,14 +1124,14 @@
unsigned long flags;
unsigned en, bit;
- dbg_trace("[%s] %p, %d\n", __func__, buf, count);
+ trace(udc->dev, "%p, %d\n", buf, count);
if (attr == NULL || buf == NULL) {
- dev_err(dev, "[%s] EINVAL\n", __func__);
+ dev_err(udc->dev, "EINVAL\n");
goto done;
}
if (sscanf(buf, "%u %u", &en, &bit) != 2 || en > 1) {
- dev_err(dev, "<1|0> <bit>: enable|disable interrupt");
+ dev_err(udc->dev, "<1|0> <bit>: enable|disable interrupt\n");
goto done;
}
@@ -1164,9 +1164,9 @@
unsigned long flags;
unsigned mode;
- dbg_trace("[%s] %p\n", __func__, buf);
+ trace(udc->dev, "%p\n", buf);
if (attr == NULL || buf == NULL) {
- dev_err(dev, "[%s] EINVAL\n", __func__);
+ dev_err(udc->dev, "EINVAL\n");
return 0;
}
@@ -1190,20 +1190,20 @@
unsigned long flags;
unsigned mode;
- dbg_trace("[%s] %p, %d\n", __func__, buf, count);
+ trace(udc->dev, "%p, %d\n", buf, count);
if (attr == NULL || buf == NULL) {
- dev_err(dev, "[%s] EINVAL\n", __func__);
+ dev_err(udc->dev, "[%s] EINVAL\n", __func__);
goto done;
}
if (sscanf(buf, "%u", &mode) != 1) {
- dev_err(dev, "<mode>: set port test mode");
+ dev_err(udc->dev, "<mode>: set port test mode");
goto done;
}
spin_lock_irqsave(&udc->lock, flags);
if (hw_port_test_set(udc, mode))
- dev_err(dev, "invalid mode\n");
+ dev_err(udc->dev, "invalid mode\n");
spin_unlock_irqrestore(&udc->lock, flags);
done:
@@ -1224,9 +1224,9 @@
unsigned long flags;
unsigned i, j, n = 0;
- dbg_trace("[%s] %p\n", __func__, buf);
+ trace(udc->dev, "%p\n", buf);
if (attr == NULL || buf == NULL) {
- dev_err(dev, "[%s] EINVAL\n", __func__);
+ dev_err(udc->dev, "[%s] EINVAL\n", __func__);
return 0;
}
@@ -1265,15 +1265,15 @@
u32 *dump;
unsigned i, k, n = 0;
- dbg_trace("[%s] %p\n", __func__, buf);
+ trace(udc->dev, "%p\n", buf);
if (attr == NULL || buf == NULL) {
- dev_err(dev, "[%s] EINVAL\n", __func__);
+ dev_err(udc->dev, "[%s] EINVAL\n", __func__);
return 0;
}
dump = kmalloc(sizeof(u32) * DUMP_ENTRIES, GFP_KERNEL);
if (!dump) {
- dev_err(dev, "%s: out of memory\n", __func__);
+ dev_err(udc->dev, "%s: out of memory\n", __func__);
return 0;
}
@@ -1303,20 +1303,21 @@
struct ci13xxx *udc = container_of(dev, struct ci13xxx, gadget.dev);
unsigned long addr, data, flags;
- dbg_trace("[%s] %p, %d\n", __func__, buf, count);
+ trace(udc->dev, "%p, %d\n", buf, count);
if (attr == NULL || buf == NULL) {
- dev_err(dev, "[%s] EINVAL\n", __func__);
+ dev_err(udc->dev, "[%s] EINVAL\n", __func__);
goto done;
}
if (sscanf(buf, "%li %li", &addr, &data) != 2) {
- dev_err(dev, "<addr> <data>: write data to register address");
+ dev_err(udc->dev,
+ "<addr> <data>: write data to register address\n");
goto done;
}
spin_lock_irqsave(&udc->lock, flags);
if (hw_register_write(udc, addr, data))
- dev_err(dev, "invalid address range\n");
+ dev_err(udc->dev, "invalid address range\n");
spin_unlock_irqrestore(&udc->lock, flags);
done:
@@ -1339,9 +1340,9 @@
struct ci13xxx_req *req = NULL;
unsigned i, j, n = 0, qSize = sizeof(struct ci13xxx_td)/sizeof(u32);
- dbg_trace("[%s] %p\n", __func__, buf);
+ trace(udc->dev, "%p\n", buf);
if (attr == NULL || buf == NULL) {
- dev_err(dev, "[%s] EINVAL\n", __func__);
+ dev_err(udc->dev, "[%s] EINVAL\n", __func__);
return 0;
}
@@ -1470,7 +1471,7 @@
int ret = 0;
unsigned length = mReq->req.length;
- trace("%p, %p", mEp, mReq);
+ trace(udc->dev, "%p, %p", mEp, mReq);
/* don't queue twice */
if (mReq->req.status == -EALREADY)
@@ -1572,7 +1573,7 @@
*/
static int _hardware_dequeue(struct ci13xxx_ep *mEp, struct ci13xxx_req *mReq)
{
- trace("%p, %p", mEp, mReq);
+ trace(mEp->udc->dev, "%p, %p", mEp, mReq);
if (mReq->req.status != -EALREADY)
return -EINVAL;
@@ -1623,7 +1624,7 @@
__releases(mEp->lock)
__acquires(mEp->lock)
{
- trace("%p", mEp);
+ trace(mEp->udc->dev, "%p", mEp);
if (mEp == NULL)
return -EINVAL;
@@ -1660,7 +1661,7 @@
struct ci13xxx *udc = container_of(gadget, struct ci13xxx, gadget);
unsigned long flags;
- trace("%p", gadget);
+ trace(udc->dev, "%p", gadget);
if (gadget == NULL)
return -EINVAL;
@@ -1708,12 +1709,7 @@
{
int retval;
- trace("%p", udc);
-
- if (udc == NULL) {
- pr_err("EINVAL\n");
- return;
- }
+ trace(udc->dev, "%p", udc);
dbg_event(0xFF, "BUS RST", 0);
@@ -1734,7 +1730,7 @@
done:
if (retval)
- pr_err("error: %i\n", retval);
+ dev_err(udc->dev, "error: %i\n", retval);
}
/**
@@ -1746,12 +1742,10 @@
*/
static void isr_get_status_complete(struct usb_ep *ep, struct usb_request *req)
{
- trace("%p, %p", ep, req);
+ trace(NULL, "%p, %p", ep, req);
- if (ep == NULL || req == NULL) {
- pr_err("EINVAL\n");
+ if (ep == NULL || req == NULL)
return;
- }
kfree(req->buf);
usb_ep_free_request(ep, req);
@@ -1774,7 +1768,7 @@
gfp_t gfp_flags = GFP_ATOMIC;
int dir, num, retval;
- trace("%p, %p", mEp, setup);
+ trace(udc->dev, "%p, %p", mEp, setup);
if (mEp == NULL || setup == NULL)
return -EINVAL;
@@ -1837,7 +1831,7 @@
struct ci13xxx *udc = req->context;
unsigned long flags;
- trace("%p, %p", ep, req);
+ trace(udc->dev, "%p, %p", ep, req);
spin_lock_irqsave(&udc->lock, flags);
if (udc->test_mode)
@@ -1858,7 +1852,7 @@
int retval;
struct ci13xxx_ep *mEp;
- trace("%p", udc);
+ trace(udc->dev, "%p", udc);
mEp = (udc->ep0_dir == TX) ? udc->ep0out : udc->ep0in;
udc->status->context = udc;
@@ -1886,7 +1880,7 @@
struct ci13xxx_ep *mEpTemp = mEp;
int uninitialized_var(retval);
- trace("%p", mEp);
+ trace(mEp->udc->dev, "%p", mEp);
if (list_empty(&mEp->qh.queue))
return -EINVAL;
@@ -1929,12 +1923,7 @@
unsigned i;
u8 tmode = 0;
- trace("%p", udc);
-
- if (udc == NULL) {
- pr_err("EINVAL\n");
- return;
- }
+ trace(udc->dev, "%p", udc);
for (i = 0; i < udc->hw_ep_max; i++) {
struct ci13xxx_ep *mEp = &udc->ci13xxx_ep[i];
@@ -1954,7 +1943,7 @@
"ERROR", err);
spin_unlock(&udc->lock);
if (usb_ep_set_halt(&mEp->ep))
- dev_err(&udc->gadget.dev,
+ dev_err(udc->dev,
"error: ep_set_halt\n");
spin_lock(&udc->lock);
}
@@ -1966,8 +1955,7 @@
continue;
if (i != 0) {
- dev_warn(&udc->gadget.dev,
- "ctrl traffic received at endpoint\n");
+ dev_warn(udc->dev, "ctrl traffic at endpoint %d\n", i);
continue;
}
@@ -2107,8 +2095,7 @@
spin_unlock(&udc->lock);
if (usb_ep_set_halt(&mEp->ep))
- dev_err(&udc->gadget.dev,
- "error: ep_set_halt\n");
+ dev_err(udc->dev, "error: ep_set_halt\n");
spin_lock(&udc->lock);
}
}
@@ -2129,7 +2116,7 @@
int retval = 0;
unsigned long flags;
- trace("%p, %p", ep, desc);
+ trace(mEp->udc->dev, "%p, %p", ep, desc);
if (ep == NULL || desc == NULL)
return -EINVAL;
@@ -2141,7 +2128,7 @@
mEp->ep.desc = desc;
if (!list_empty(&mEp->qh.queue))
- warn("enabling a non-empty endpoint!");
+ dev_warn(mEp->udc->dev, "enabling a non-empty endpoint!\n");
mEp->dir = usb_endpoint_dir_in(desc) ? TX : RX;
mEp->num = usb_endpoint_num(desc);
@@ -2186,7 +2173,7 @@
int direction, retval = 0;
unsigned long flags;
- trace("%p", ep);
+ trace(mEp->udc->dev, "%p", ep);
if (ep == NULL)
return -EINVAL;
@@ -2225,12 +2212,10 @@
struct ci13xxx_ep *mEp = container_of(ep, struct ci13xxx_ep, ep);
struct ci13xxx_req *mReq = NULL;
- trace("%p, %i", ep, gfp_flags);
+ trace(mEp->udc->dev, "%p, %i", ep, gfp_flags);
- if (ep == NULL) {
- pr_err("EINVAL\n");
+ if (ep == NULL)
return NULL;
- }
mReq = kzalloc(sizeof(struct ci13xxx_req), gfp_flags);
if (mReq != NULL) {
@@ -2261,13 +2246,12 @@
struct ci13xxx_req *mReq = container_of(req, struct ci13xxx_req, req);
unsigned long flags;
- trace("%p, %p", ep, req);
+ trace(mEp->udc->dev, "%p, %p", ep, req);
if (ep == NULL || req == NULL) {
- pr_err("EINVAL\n");
return;
} else if (!list_empty(&mReq->queue)) {
- pr_err("EBUSY\n");
+ dev_err(mEp->udc->dev, "freeing queued request\n");
return;
}
@@ -2295,7 +2279,7 @@
int retval = 0;
unsigned long flags;
- trace("%p, %p, %X", ep, req, gfp_flags);
+ trace(mEp->udc->dev, "%p, %p, %X", ep, req, gfp_flags);
if (ep == NULL || req == NULL || mEp->ep.desc == NULL)
return -EINVAL;
@@ -2309,21 +2293,22 @@
if (!list_empty(&mEp->qh.queue)) {
_ep_nuke(mEp);
retval = -EOVERFLOW;
- warn("endpoint ctrl %X nuked", _usb_addr(mEp));
+ dev_warn(mEp->udc->dev, "endpoint ctrl %X nuked\n",
+ _usb_addr(mEp));
}
}
/* first nuke then test link, e.g. previous status has not sent */
if (!list_empty(&mReq->queue)) {
retval = -EBUSY;
- pr_err("request already in queue\n");
+ dev_err(mEp->udc->dev, "request already in queue\n");
goto done;
}
if (req->length > 4 * CI13XXX_PAGE_SIZE) {
req->length = 4 * CI13XXX_PAGE_SIZE;
retval = -EMSGSIZE;
- warn("request length truncated");
+ dev_warn(mEp->udc->dev, "request length truncated\n");
}
dbg_queue(_usb_addr(mEp), req, retval);
@@ -2357,7 +2342,7 @@
struct ci13xxx_req *mReq = container_of(req, struct ci13xxx_req, req);
unsigned long flags;
- trace("%p, %p", ep, req);
+ trace(mEp->udc->dev, "%p, %p", ep, req);
if (ep == NULL || req == NULL || mReq->req.status != -EALREADY ||
mEp->ep.desc == NULL || list_empty(&mReq->queue) ||
@@ -2401,7 +2386,7 @@
int direction, retval = 0;
unsigned long flags;
- trace("%p, %i", ep, value);
+ trace(mEp->udc->dev, "%p, %i", ep, value);
if (ep == NULL || mEp->ep.desc == NULL)
return -EINVAL;
@@ -2444,7 +2429,7 @@
struct ci13xxx_ep *mEp = container_of(ep, struct ci13xxx_ep, ep);
unsigned long flags;
- trace("%p", ep);
+ trace(mEp->udc->dev, "%p", ep);
if (ep == NULL || mEp->ep.desc == NULL)
return -EINVAL;
@@ -2469,10 +2454,10 @@
struct ci13xxx_ep *mEp = container_of(ep, struct ci13xxx_ep, ep);
unsigned long flags;
- trace("%p", ep);
+ trace(mEp->udc->dev, "%p", ep);
if (ep == NULL) {
- pr_err("%02X: -EINVAL\n", _usb_addr(mEp));
+ dev_err(mEp->udc->dev, "%02X: -EINVAL\n", _usb_addr(mEp));
return;
}
@@ -2542,17 +2527,17 @@
unsigned long flags;
int ret = 0;
- trace();
+ trace(udc->dev, "");
spin_lock_irqsave(&udc->lock, flags);
if (!udc->remote_wakeup) {
ret = -EOPNOTSUPP;
- trace("remote wakeup feature is not enabled\n");
+ trace(udc->dev, "remote wakeup feature is not enabled\n");
goto out;
}
if (!hw_read(udc, OP_PORTSC, PORTSC_SUSP)) {
ret = -EINVAL;
- trace("port is not suspended\n");
+ trace(udc->dev, "port is not suspended\n");
goto out;
}
hw_write(udc, OP_PORTSC, PORTSC_FPR, PORTSC_FPR);
@@ -2602,7 +2587,7 @@
int i, j;
int retval = -ENOMEM;
- trace("%p", driver);
+ trace(udc->dev, "%p", driver);
if (driver == NULL ||
bind == NULL ||
@@ -2632,7 +2617,7 @@
spin_lock_irqsave(&udc->lock, flags);
- info("hw_ep_max = %d", udc->hw_ep_max);
+ dev_info(udc->dev, "hw_ep_max = %d\n", udc->hw_ep_max);
udc->gadget.dev.driver = NULL;
@@ -2740,7 +2725,7 @@
struct ci13xxx *udc = _udc;
unsigned long i, flags;
- trace("%p", driver);
+ trace(udc->dev, "%p", driver);
if (driver == NULL ||
driver->unbind == NULL ||
@@ -2813,10 +2798,10 @@
irqreturn_t retval;
u32 intr;
- trace();
+ trace(udc ? udc->dev : NULL, "");
if (udc == NULL) {
- pr_err("ENODEV\n");
+ dev_err(udc->dev, "ENODEV");
return IRQ_HANDLED;
}
@@ -2885,10 +2870,7 @@
*/
static void udc_release(struct device *dev)
{
- trace("%p", dev);
-
- if (dev == NULL)
- pr_err("EINVAL\n");
+ trace(dev->parent, "%p", dev);
}
/**
@@ -2907,7 +2889,7 @@
struct ci13xxx *udc;
int retval = 0;
- trace("%p, %p, %p", dev, regs, driver->name);
+ trace(dev, "%p, %p, %p", dev, regs, driver->name);
if (dev == NULL || regs == NULL || driver == NULL ||
driver->name == NULL)
@@ -2936,6 +2918,8 @@
udc->gadget.dev.parent = dev;
udc->gadget.dev.release = udc_release;
+ udc->dev = dev;
+
retval = hw_device_init(udc, regs, driver->capoffset);
if (retval < 0)
goto free_udc;
@@ -3015,10 +2999,9 @@
{
struct ci13xxx *udc = _udc;
- if (udc == NULL) {
- pr_err("EINVAL\n");
+ if (udc == NULL)
return;
- }
+
usb_del_gadget_udc(&udc->gadget);
if (udc->transceiver) {