[PATCH 26/44] usb: misc: ldusb: don't print on ENOMEM

[Wolfram Sang]

All kmalloc-based functions print enough information on failures.

Signed-off-by: Wolfram Sang <wsa-...@sang-engineering.com>
---
 drivers/usb/misc/ldusb.c | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c
index 84890791c2f830..9ca595632f171c 100644
--- a/drivers/usb/misc/ldusb.c
+++ b/drivers/usb/misc/ldusb.c
@@ -658,10 +658,8 @@ static int ld_usb_probe(struct usb_interface *intf, const 
struct usb_device_id *
        /* allocate memory for our device state and initialize it */
 
        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-       if (dev == NULL) {
-               dev_err(&intf->dev, "Out of memory\n");
+       if (!dev)
                goto exit;
-       }
        mutex_init(&dev->mutex);
        spin_lock_init(&dev->rbsl);
        dev->intf = intf;
@@ -674,10 +672,8 @@ static int ld_usb_probe(struct usb_interface *intf, const 
struct usb_device_id *
             (le16_to_cpu(udev->descriptor.idProduct) == 
USB_DEVICE_ID_LD_COM3LAB)) &&
            (le16_to_cpu(udev->descriptor.bcdDevice) <= 0x103)) {
                buffer = kmalloc(256, GFP_KERNEL);
-               if (buffer == NULL) {
-                       dev_err(&intf->dev, "Couldn't allocate string 
buffer\n");
+               if (!buffer)
                        goto error;
-               }
                /* usb_string makes SETUP+STALL to leave always ControlReadLoop 
*/
                usb_string(udev, 255, buffer, 256);
                kfree(buffer);
@@ -704,25 +700,19 @@ static int ld_usb_probe(struct usb_interface *intf, const 
struct usb_device_id *
 
        dev->interrupt_in_endpoint_size = 
usb_endpoint_maxp(dev->interrupt_in_endpoint);
        dev->ring_buffer = 
kmalloc(ring_buffer_size*(sizeof(size_t)+dev->interrupt_in_endpoint_size), 
GFP_KERNEL);
-       if (!dev->ring_buffer) {
-               dev_err(&intf->dev, "Couldn't allocate ring_buffer\n");
+       if (!dev->ring_buffer)
                goto error;
-       }
        dev->interrupt_in_buffer = kmalloc(dev->interrupt_in_endpoint_size, 
GFP_KERNEL);
-       if (!dev->interrupt_in_buffer) {
-               dev_err(&intf->dev, "Couldn't allocate interrupt_in_buffer\n");
+       if (!dev->interrupt_in_buffer)
                goto error;
-       }
        dev->interrupt_in_urb = usb_alloc_urb(0, GFP_KERNEL);
        if (!dev->interrupt_in_urb)
                goto error;
        dev->interrupt_out_endpoint_size = dev->interrupt_out_endpoint ? 
usb_endpoint_maxp(dev->interrupt_out_endpoint) :
                                                                         
udev->descriptor.bMaxPacketSize0;
        dev->interrupt_out_buffer = 
kmalloc(write_buffer_size*dev->interrupt_out_endpoint_size, GFP_KERNEL);
-       if (!dev->interrupt_out_buffer) {
-               dev_err(&intf->dev, "Couldn't allocate interrupt_out_buffer\n");
+       if (!dev->interrupt_out_buffer)
                goto error;
-       }
        dev->interrupt_out_urb = usb_alloc_urb(0, GFP_KERNEL);
        if (!dev->interrupt_out_urb)
                goto error;
-- 
2.9.3

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html