cdc-acm: kill unnecessary messages

Memory allocation failures are reported by a central facility.
No need to repeat the job.

Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 9 insertions, 24 deletions

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index a417b738824f..e78720b59d67 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1298,10 +1298,8 @@ made_compressed_probe:
         dev_dbg(&intf->dev, "interfaces are valid\n");
 
         acm = kzalloc(sizeof(struct acm), GFP_KERNEL);
-        if (acm == NULL) {
-                dev_err(&intf->dev, "out of memory (acm kzalloc)\n");
+        if (acm == NULL)
                 goto alloc_fail;
-        }
 
         minor = acm_alloc_minor(acm);
         if (minor == ACM_TTY_MINORS) {
@@ -1340,42 +1338,32 @@ made_compressed_probe:
         acm->quirks = quirks;
 
         buf = usb_alloc_coherent(usb_dev, ctrlsize, GFP_KERNEL, &acm->ctrl_dma);
-        if (!buf) {
-                dev_err(&intf->dev, "out of memory (ctrl buffer alloc)\n");
+        if (!buf)
                 goto alloc_fail2;
-        }
         acm->ctrl_buffer = buf;
 
-        if (acm_write_buffers_alloc(acm) < 0) {
-                dev_err(&intf->dev, "out of memory (write buffer alloc)\n");
+        if (acm_write_buffers_alloc(acm) < 0)
                 goto alloc_fail4;
-        }
 
         acm->ctrlurb = usb_alloc_urb(0, GFP_KERNEL);
-        if (!acm->ctrlurb) {
-                dev_err(&intf->dev, "out of memory (ctrlurb kmalloc)\n");
+        if (!acm->ctrlurb)
                 goto alloc_fail5;
-        }
+
         for (i = 0; i < num_rx_buf; i++) {
                 struct acm_rb *rb = &(acm->read_buffers[i]);
                 struct urb *urb;
 
                 rb->base = usb_alloc_coherent(acm->dev, readsize, GFP_KERNEL,
                                                                 &rb->dma);
-                if (!rb->base) {
-                        dev_err(&intf->dev, "out of memory "
-                                        "(read bufs usb_alloc_coherent)\n");
+                if (!rb->base)
                         goto alloc_fail6;
-                }
                 rb->index = i;
                 rb->instance = acm;
 
                 urb = usb_alloc_urb(0, GFP_KERNEL);
-                if (!urb) {
-                        dev_err(&intf->dev,
-                                "out of memory (read urbs usb_alloc_urb)\n");
+                if (!urb)
                         goto alloc_fail6;
-                }
+
                 urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
                 urb->transfer_dma = rb->dma;
                 if (acm->is_int_ep) {
@@ -1400,11 +1388,8 @@ made_compressed_probe:
                 struct acm_wb *snd = &(acm->wb[i]);
 
                 snd->urb = usb_alloc_urb(0, GFP_KERNEL);
-                if (snd->urb == NULL) {
-                        dev_err(&intf->dev,
-                                "out of memory (write urbs usb_alloc_urb)\n");
+                if (snd->urb == NULL)
                         goto alloc_fail7;
-                }
 
                 if (usb_endpoint_xfer_int(epwrite))
                         usb_fill_int_urb(snd->urb, usb_dev,