drivers: net: usb: Remove unnecessary alloc/OOM messages

alloc failures already get standardized OOM
messages and a dump_stack.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/usb/ax88172a.c b/drivers/net/usb/ax88172a.c
index 76ee5410d69e55074b6b9b34d93686add1a8910f..d012203b0f298dd1e1fc1a69192cda3d0c82c523 100644 (file)
--- a/drivers/net/usb/ax88172a.c
+++ b/drivers/net/usb/ax88172a.c
@@ -117,7 +117,6 @@ static int ax88172a_init_mdio(struct usbnet *dev)
 
        priv->mdio->irq = kzalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
        if (!priv->mdio->irq) {
-               netdev_err(dev->net, "Could not allocate mdio->irq\n");
                ret = -ENOMEM;
                goto mfree;
        }
@@ -236,10 +235,9 @@ static int ax88172a_bind(struct usbnet *dev, struct usb_interface *intf)
        usbnet_get_endpoints(dev, intf);
 
        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
-       if (!priv) {
-               netdev_err(dev->net, "Could not allocate memory for private data\n");
+       if (!priv)
                return -ENOMEM;
-       }
+
        dev->driver_priv = priv;
 
        /* Get the MAC address */

diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index cd8ccb240f4b2196f8bcad99e7c613d5b413452b..41e5dfb5ee64eb0029d0c9a769759db58d5fbd52 100644 (file)
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -2317,10 +2317,8 @@ static int hso_serial_common_create(struct hso_serial *serial, int num_urbs,
                serial->rx_urb[i]->transfer_buffer_length = 0;
                serial->rx_data[i] = kzalloc(serial->rx_data_length,
                                             GFP_KERNEL);
-               if (!serial->rx_data[i]) {
-                       dev_err(dev, "%s - Out of memory\n", __func__);
+               if (!serial->rx_data[i])
                        goto exit;
-               }
        }
 
        /* TX, allocate urb and initialize */
@@ -2336,15 +2334,12 @@ static int hso_serial_common_create(struct hso_serial *serial, int num_urbs,
        serial->tx_buffer_count = 0;
        serial->tx_data_length = tx_size;
        serial->tx_data = kzalloc(serial->tx_data_length, GFP_KERNEL);
-       if (!serial->tx_data) {
-               dev_err(dev, "%s - Out of memory\n", __func__);
+       if (!serial->tx_data)
                goto exit;
-       }
+
        serial->tx_buffer = kzalloc(serial->tx_data_length, GFP_KERNEL);
-       if (!serial->tx_buffer) {
-               dev_err(dev, "%s - Out of memory\n", __func__);
+       if (!serial->tx_buffer)
                goto exit;
-       }
 
        return 0;
 exit:
@@ -2580,10 +2575,8 @@ static struct hso_device *hso_create_net_device(struct usb_interface *interface,
                }
                hso_net->mux_bulk_rx_buf_pool[i] = kzalloc(MUX_BULK_RX_BUF_SIZE,
                                                           GFP_KERNEL);
-               if (!hso_net->mux_bulk_rx_buf_pool[i]) {
-                       dev_err(&interface->dev, "Could not allocate rx buf\n");
+               if (!hso_net->mux_bulk_rx_buf_pool[i])
                        goto exit;
-               }
        }
        hso_net->mux_bulk_tx_urb = usb_alloc_urb(0, GFP_KERNEL);
        if (!hso_net->mux_bulk_tx_urb) {
@@ -2591,10 +2584,8 @@ static struct hso_device *hso_create_net_device(struct usb_interface *interface,
                goto exit;
        }
        hso_net->mux_bulk_tx_buf = kzalloc(MUX_BULK_TX_BUF_SIZE, GFP_KERNEL);
-       if (!hso_net->mux_bulk_tx_buf) {
-               dev_err(&interface->dev, "Could not allocate tx buf\n");
+       if (!hso_net->mux_bulk_tx_buf)
                goto exit;
-       }
 
        add_net_device(hso_dev);
 
@@ -2818,10 +2809,8 @@ struct hso_shared_int *hso_create_shared_int(struct usb_interface *interface)
        mux->shared_intr_buf =
                kzalloc(le16_to_cpu(mux->intr_endp->wMaxPacketSize),
                        GFP_KERNEL);
-       if (!mux->shared_intr_buf) {
-               dev_err(&interface->dev, "Could not allocate intr buf?\n");
+       if (!mux->shared_intr_buf)
                goto exit;
-       }
 
        mutex_init(&mux->shared_int_lock);
 

diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
index 453aa6c1277c5347c2f5fa7864ba1c43f483a5a6..79ab2435d9d3906a321332f8e72e961e35c3f1e0 100644 (file)
--- a/drivers/net/usb/sierra_net.c
+++ b/drivers/net/usb/sierra_net.c
@@ -459,11 +459,9 @@ static void sierra_net_kevent(struct work_struct *work)
 
                /* Query the modem for the LSI message */
                buf = kzalloc(SIERRA_NET_USBCTL_BUF_LEN, GFP_KERNEL);
-               if (!buf) {
-                       netdev_err(dev->net,
-                               "failed to allocate buf for LS msg\n");
+               if (!buf)
                        return;
-               }
+
                ifnum = priv->ifnum;
                len = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0),
                                USB_CDC_GET_ENCAPSULATED_RESPONSE,
@@ -686,10 +684,8 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
        }
        /* Initialize sierra private data */
        priv = kzalloc(sizeof *priv, GFP_KERNEL);
-       if (!priv) {
-               dev_err(&dev->udev->dev, "No memory");
+       if (!priv)
                return -ENOMEM;
-       }
 
        priv->usbnet = dev;
        priv->ifnum = ifacenum;

diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c
index 251a3354a4b049b2299233aa90606f400e5ccf2b..9abe51710f229377cb9f405ffedb198eab580738 100644 (file)
--- a/drivers/net/usb/smsc75xx.c
+++ b/drivers/net/usb/smsc75xx.c
@@ -1393,13 +1393,11 @@ static int smsc75xx_bind(struct usbnet *dev, struct usb_interface *intf)
        }
 
        dev->data[0] = (unsigned long)kzalloc(sizeof(struct smsc75xx_priv),
-               GFP_KERNEL);
+                                             GFP_KERNEL);
 
        pdata = (struct smsc75xx_priv *)(dev->data[0]);
-       if (!pdata) {
-               netdev_warn(dev->net, "Unable to allocate smsc75xx_priv\n");
+       if (!pdata)
                return -ENOMEM;
-       }
 
        pdata->dev = dev;
 

diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 6a74a68220beee8a26554fc2c0ae70fe2c8becea..ff4fa37dfd1db3793f705c59214802acd9cdfd1f 100644 (file)
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -1116,13 +1116,11 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf)
        }
 
        dev->data[0] = (unsigned long)kzalloc(sizeof(struct smsc95xx_priv),
-               GFP_KERNEL);
+                                             GFP_KERNEL);
 
        pdata = (struct smsc95xx_priv *)(dev->data[0]);
-       if (!pdata) {
-               netdev_warn(dev->net, "Unable to allocate struct smsc95xx_priv\n");
+       if (!pdata)
                return -ENOMEM;
-       }
 
        spin_lock_init(&pdata->mac_cr_lock);
 

diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index f34b2ebee815ff6b832ef280e26ce7039ef6bfd6..30c1b330e983a2ae163f9965c4aa73a416179468 100644 (file)
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -1790,11 +1790,8 @@ int usbnet_write_cmd_async(struct usbnet *dev, u8 cmd, u8 reqtype,
        }
 
        req = kmalloc(sizeof(struct usb_ctrlrequest), GFP_ATOMIC);
-       if (!req) {
-               netdev_err(dev->net, "Failed to allocate memory for %s\n",
-                          __func__);
+       if (!req)
                goto fail_free_buf;
-       }
 
        req->bRequestType = reqtype;
        req->bRequest = cmd;