Staging: emxx_udc: Replace custom printk macro ERR with dev_err or pr_err

This patch removes the use of custom printk macros ERR and replace it
with dev_err, or pr_err in the following cases:
- if no appropriate struct device *dev field where found for dev_err.
- or dev could be null eg. "dev_err(udc->dev" not possible inside "if
  (udc == null)"
Issue addressed by checkpatch.pl.

Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/emxx_udc/emxx_udc.c b/drivers/staging/emxx_udc/emxx_udc.c
index 4cc6296ed007a8ea9a4ad45cb67f2a93c909aacf..35dc1c44434052a64de9d8e5e34080254e408e66 100644 (file)
--- a/drivers/staging/emxx_udc/emxx_udc.c
+++ b/drivers/staging/emxx_udc/emxx_udc.c
@@ -115,7 +115,7 @@ static void _nbu2ss_dump_register(struct nbu2ss_udc *udc)
        pr_info("=== %s()\n", __func__);
 
        if (udc == NULL) {
-               ERR("%s udc == NULL\n", __func__);
+               pr_err("%s udc == NULL\n", __func__);
                return;
        }
 
@@ -808,7 +808,7 @@ static int _nbu2ss_ep0_out_transfer(
                return 0;               /* Short Packet Transfer End */
 
        if (req->req.actual > req->req.length) {
-               ERR(" *** Overrun Error\n");
+               dev_err(udc->dev, " *** Overrun Error\n");
                return -EOVERFLOW;
        }
 
@@ -1026,8 +1026,8 @@ static int _nbu2ss_epn_out_transfer(
        }
 
        if (req->req.actual > req->req.length) {
-               ERR(" *** Overrun Error\n");
-               ERR(" *** actual = %d, length = %d\n",
+               dev_err(udc->dev, " Overrun Error\n");
+               dev_err(udc->dev, " actual = %d, length = %d\n",
                        req->req.actual, req->req.length);
                result = -EOVERFLOW;
        }
@@ -1638,7 +1638,7 @@ static int std_req_get_status(struct nbu2ss_udc *udc)
                _nbu2ss_ep0_in_transfer(udc, &udc->ep[0], &udc->ep0_req);
 
        } else {
-               ERR("*** Error GET_STATUS\n");
+               dev_err(udc->dev, " Error GET_STATUS\n");
        }
 
        return result;
@@ -2345,7 +2345,7 @@ static int _nbu2ss_enable_controller(struct nbu2ss_udc *udc)
                waitcnt++;
                udelay(1);      /* 1us wait */
                if (waitcnt == EPC_PLL_LOCK_COUNT) {
-                       ERR("*** Reset Cancel failed\n");
+                       dev_err(udc->dev, "*** Reset Cancel failed\n");
                        return -EINVAL;
                }
        };
@@ -2607,13 +2607,13 @@ static int nbu2ss_ep_enable(
        struct nbu2ss_udc       *udc;
 
        if ((_ep == NULL) || (desc == NULL)) {
-               ERR(" *** %s, bad param\n", __func__);
+               pr_err(" *** %s, bad param\n", __func__);
                return -EINVAL;
        }
 
        ep = container_of(_ep, struct nbu2ss_ep, ep);
        if ((ep == NULL) || (ep->udc == NULL)) {
-               ERR(" *** %s, ep == NULL !!\n", __func__);
+               pr_err(" *** %s, ep == NULL !!\n", __func__);
                return -EINVAL;
        }
 
@@ -2621,7 +2621,7 @@ static int nbu2ss_ep_enable(
        if ((ep_type == USB_ENDPOINT_XFER_CONTROL)
                || (ep_type == USB_ENDPOINT_XFER_ISOC)) {
 
-               ERR(" *** %s, bat bmAttributes\n", __func__);
+               pr_err(" *** %s, bat bmAttributes\n", __func__);
                return -EINVAL;
        }
 
@@ -2632,7 +2632,7 @@ static int nbu2ss_ep_enable(
        if ((udc->driver == NULL)
                || (udc->gadget.speed == USB_SPEED_UNKNOWN)) {
 
-               ERR(" *** %s, udc !!\n", __func__);
+               dev_err(ep->udc->dev, " *** %s, udc !!\n", __func__);
                return -ESHUTDOWN;
        }
 
@@ -2667,13 +2667,13 @@ static int nbu2ss_ep_disable(struct usb_ep *_ep)
        unsigned long           flags;
 
        if (_ep == NULL) {
-               ERR(" *** %s, bad param\n", __func__);
+               pr_err(" *** %s, bad param\n", __func__);
                return -EINVAL;
        }
 
        ep = container_of(_ep, struct nbu2ss_ep, ep);
        if ((ep == NULL) || (ep->udc == NULL)) {
-               ERR(" *** %s, ep == NULL !!\n", __func__);
+               pr_err("udc: *** %s, ep == NULL !!\n", __func__);
                return -EINVAL;
        }
 
@@ -2737,10 +2737,10 @@ static int nbu2ss_ep_queue(
        /* catch various bogus parameters */
        if ((_ep == NULL) || (_req == NULL)) {
                if (_ep == NULL)
-                       ERR("*** %s --- _ep == NULL\n", __func__);
+                       pr_err("udc: %s --- _ep == NULL\n", __func__);
 
                if (_req == NULL)
-                       ERR("*** %s --- _req == NULL\n", __func__);
+                       pr_err("udc: %s --- _req == NULL\n", __func__);
 
                return -EINVAL;
        }
@@ -2751,13 +2751,13 @@ static int nbu2ss_ep_queue(
             || !list_empty(&req->queue))) {
 
                if (!_req->complete)
-                       ERR("*** %s --- !_req->complete\n", __func__);
+                       pr_err("udc: %s --- !_req->complete\n", __func__);
 
                if (!_req->buf)
-                       ERR("*** %s --- !_req->buf\n", __func__);
+                       pr_err("udc:%s --- !_req->buf\n", __func__);
 
                if (!list_empty(&req->queue))
-                       ERR("*** %s --- !list_empty(&req->queue)\n", __func__);
+                       pr_err("%s --- !list_empty(&req->queue)\n", __func__);
 
                return -EINVAL;
        }
@@ -2773,7 +2773,8 @@ static int nbu2ss_ep_queue(
        }
 
        if (unlikely(!udc->driver)) {
-               ERR("%s, bogus device state %p\n", __func__, udc->driver);
+               dev_err(udc->dev, "%s, bogus device state %p\n", __func__,
+                               udc->driver);
                return -ESHUTDOWN;
        }
 
@@ -2812,7 +2813,8 @@ static int nbu2ss_ep_queue(
 
                result = _nbu2ss_start_transfer(udc, ep, req, FALSE);
                if (result < 0) {
-                       ERR(" *** %s, result = %d\n", __func__, result);
+                       dev_err(udc->dev, " *** %s, result = %d\n", __func__,
+                                       result);
                        list_del(&req->queue);
                } else if ((ep->epnum > 0) && (ep->direct == USB_DIR_OUT)) {
 #ifdef USE_DMA
@@ -2844,13 +2846,13 @@ static int nbu2ss_ep_dequeue(
 
        /* catch various bogus parameters */
        if ((_ep == NULL) || (_req == NULL)) {
-               /* ERR("%s, bad param(1)\n", __func__); */
+               /* pr_err("%s, bad param(1)\n", __func__); */
                return -EINVAL;
        }
 
        ep = container_of(_ep, struct nbu2ss_ep, ep);
        if (!ep) {
-               ERR("%s, ep == NULL !!\n", __func__);
+               pr_err("%s, ep == NULL !!\n", __func__);
                return -EINVAL;
        }
 
@@ -2890,19 +2892,19 @@ static int nbu2ss_ep_set_halt(struct usb_ep *_ep, int value)
 /*     INFO("=== %s()\n", __func__); */
 
        if (!_ep) {
-               ERR("%s, bad param\n", __func__);
+               pr_err("%s, bad param\n", __func__);
                return -EINVAL;
        }
 
        ep = container_of(_ep, struct nbu2ss_ep, ep);
        if (!ep) {
-               ERR("%s, bad ep\n", __func__);
+               pr_err("%s, bad ep\n", __func__);
                return -EINVAL;
        }
 
        udc = ep->udc;
        if (!udc) {
-               ERR(" *** %s, bad udc\n", __func__);
+               dev_err(ep->udc->dev, " *** %s, bad udc\n", __func__);
                return -EINVAL;
        }
 
@@ -2944,19 +2946,19 @@ static int nbu2ss_ep_fifo_status(struct usb_ep *_ep)
 /*     INFO("=== %s()\n", __func__); */
 
        if (!_ep) {
-               ERR("%s, bad param\n", __func__);
+               pr_err("%s, bad param\n", __func__);
                return -EINVAL;
        }
 
        ep = container_of(_ep, struct nbu2ss_ep, ep);
        if (!ep) {
-               ERR("%s, bad ep\n", __func__);
+               pr_err("%s, bad ep\n", __func__);
                return -EINVAL;
        }
 
        udc = ep->udc;
        if (!udc) {
-               ERR("%s, bad udc\n", __func__);
+               dev_err(ep->udc->dev, "%s, bad udc\n", __func__);
                return -EINVAL;
        }
 
@@ -2992,19 +2994,19 @@ static void  nbu2ss_ep_fifo_flush(struct usb_ep *_ep)
 /*     INFO("=== %s()\n", __func__); */
 
        if (!_ep) {
-               ERR("%s, bad param\n", __func__);
+               pr_err("udc: %s, bad param\n", __func__);
                return;
        }
 
        ep = container_of(_ep, struct nbu2ss_ep, ep);
        if (!_ep) {
-               ERR("%s, bad ep\n", __func__);
+               pr_err("udc: %s, bad ep\n", __func__);
                return;
        }
 
        udc = ep->udc;
        if (!udc) {
-               ERR("%s, bad udc\n", __func__);
+               dev_err(ep->udc->dev, "%s, bad udc\n", __func__);
                return;
        }
 
@@ -3048,13 +3050,13 @@ static int nbu2ss_gad_get_frame(struct usb_gadget *pgadget)
 /*     INFO("=== %s()\n", __func__); */
 
        if (pgadget == NULL) {
-               ERR("%s, bad param\n", __func__);
+               pr_err("udc: %s, bad param\n", __func__);
                return -EINVAL;
        }
 
        udc = container_of(pgadget, struct nbu2ss_udc, gadget);
        if (udc == NULL) {
-               ERR("%s, udc == NULL\n", __func__);
+               dev_err(&pgadget->dev, "%s, udc == NULL\n", __func__);
                return -EINVAL;
        }
 
@@ -3078,13 +3080,13 @@ static int nbu2ss_gad_wakeup(struct usb_gadget *pgadget)
 /*     INFO("=== %s()\n", __func__); */
 
        if (pgadget == NULL) {
-               ERR("%s, bad param\n", __func__);
+               pr_err("%s, bad param\n", __func__);
                return -EINVAL;
        }
 
        udc = container_of(pgadget, struct nbu2ss_udc, gadget);
        if (udc == NULL) {
-               ERR("%s, udc == NULL\n", __func__);
+               dev_err(&pgadget->dev, "%s, udc == NULL\n", __func__);
                return -EINVAL;
        }
 
@@ -3118,7 +3120,7 @@ static int nbu2ss_gad_set_selfpowered(struct usb_gadget *pgadget,
 /*     INFO("=== %s()\n", __func__); */
 
        if (pgadget == NULL) {
-               ERR("%s, bad param\n", __func__);
+               pr_err("%s, bad param\n", __func__);
                return -EINVAL;
        }
 
@@ -3147,7 +3149,7 @@ static int nbu2ss_gad_vbus_draw(struct usb_gadget *pgadget, unsigned mA)
 /*     INFO("=== %s()\n", __func__); */
 
        if (pgadget == NULL) {
-               ERR("%s, bad param\n", __func__);
+               pr_err("%s, bad param\n", __func__);
                return -EINVAL;
        }
 
@@ -3169,7 +3171,7 @@ static int nbu2ss_gad_pullup(struct usb_gadget *pgadget, int is_on)
 /*     INFO("=== %s()\n", __func__); */
 
        if (pgadget == NULL) {
-               ERR("%s, bad param\n", __func__);
+               pr_err("%s, bad param\n", __func__);
                return -EINVAL;
        }
 
@@ -3340,7 +3342,7 @@ static int nbu2ss_drv_probe(struct platform_device *pdev)
 
        /* USB Function Controller Interrupt */
        if (status != 0) {
-               ERR("request_irq(USB_UDC_IRQ_1) failed\n");
+               dev_err(udc->dev, "request_irq(USB_UDC_IRQ_1) failed\n");
                goto cleanup1;
        }
 
@@ -3360,7 +3362,7 @@ static int nbu2ss_drv_probe(struct platform_device *pdev)
                                udc);
 
        if (status != 0) {
-               ERR("request_irq(INT_VBUS) failed\n");
+               dev_err(udc->dev, "request_irq(INT_VBUS) failed\n");
                goto cleanup1;
        }