Merge remote-tracking branch 'usb/usb-next'

[deliverable/linux.git] / drivers / usb / gadget / udc / fsl_qe_udc.c

diff --git a/drivers/usb/gadget/udc/fsl_qe_udc.c b/drivers/usb/gadget/udc/fsl_qe_udc.c
index 8bb011ea78f7df483f23a0325fc082f36fb8b900..4fff51b8a18e4062b4e99ba97b424c93cc2416d7 100644 (file)
--- a/drivers/usb/gadget/udc/fsl_qe_udc.c
+++ b/drivers/usb/gadget/udc/fsl_qe_udc.c
@@ -421,10 +421,8 @@ static int qe_ep_rxbd_update(struct qe_ep *ep)
        bd = ep->rxbase;
 
        ep->rxframe = kmalloc(sizeof(*ep->rxframe), GFP_ATOMIC);
-       if (ep->rxframe == NULL) {
-               dev_err(ep->udc->dev, "malloc rxframe failed\n");
+       if (!ep->rxframe)
                return -ENOMEM;
-       }
 
        qe_frame_init(ep->rxframe);
 
@@ -435,9 +433,7 @@ static int qe_ep_rxbd_update(struct qe_ep *ep)
 
        size = (ep->ep.maxpacket + USB_CRC_SIZE + 2) * (bdring_len + 1);
        ep->rxbuffer = kzalloc(size, GFP_ATOMIC);
-       if (ep->rxbuffer == NULL) {
-               dev_err(ep->udc->dev, "malloc rxbuffer failed,size=%d\n",
-                               size);
+       if (!ep->rxbuffer) {
                kfree(ep->rxframe);
                return -ENOMEM;
        }
@@ -668,10 +664,8 @@ static int qe_ep_init(struct qe_udc *udc,
 
        if ((ep->tm == USBP_TM_CTL) || (ep->dir == USB_DIR_IN)) {
                ep->txframe = kmalloc(sizeof(*ep->txframe), GFP_ATOMIC);
-               if (ep->txframe == NULL) {
-                       dev_err(udc->dev, "malloc txframe failed\n");
+               if (!ep->txframe)
                        goto en_done2;
-               }
                qe_frame_init(ep->txframe);
        }
 
@@ -2344,10 +2338,8 @@ static struct qe_udc *qe_udc_config(struct platform_device *ofdev)
        u32 offset;
 
        udc = kzalloc(sizeof(*udc), GFP_KERNEL);
-       if (udc == NULL) {
-               dev_err(&ofdev->dev, "malloc udc failed\n");
+       if (!udc)
                goto cleanup;
-       }
 
        udc->dev = &ofdev->dev;