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>
This commit is contained in:
parent
b2adaca92c
commit
38673c8218
@ -117,7 +117,6 @@ static int ax88172a_init_mdio(struct usbnet *dev)
|
|||||||
|
|
||||||
priv->mdio->irq = kzalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
|
priv->mdio->irq = kzalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
|
||||||
if (!priv->mdio->irq) {
|
if (!priv->mdio->irq) {
|
||||||
netdev_err(dev->net, "Could not allocate mdio->irq\n");
|
|
||||||
ret = -ENOMEM;
|
ret = -ENOMEM;
|
||||||
goto mfree;
|
goto mfree;
|
||||||
}
|
}
|
||||||
@ -236,10 +235,9 @@ static int ax88172a_bind(struct usbnet *dev, struct usb_interface *intf)
|
|||||||
usbnet_get_endpoints(dev, intf);
|
usbnet_get_endpoints(dev, intf);
|
||||||
|
|
||||||
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
|
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
|
||||||
if (!priv) {
|
if (!priv)
|
||||||
netdev_err(dev->net, "Could not allocate memory for private data\n");
|
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
|
||||||
dev->driver_priv = priv;
|
dev->driver_priv = priv;
|
||||||
|
|
||||||
/* Get the MAC address */
|
/* Get the MAC address */
|
||||||
|
@ -2317,11 +2317,9 @@ static int hso_serial_common_create(struct hso_serial *serial, int num_urbs,
|
|||||||
serial->rx_urb[i]->transfer_buffer_length = 0;
|
serial->rx_urb[i]->transfer_buffer_length = 0;
|
||||||
serial->rx_data[i] = kzalloc(serial->rx_data_length,
|
serial->rx_data[i] = kzalloc(serial->rx_data_length,
|
||||||
GFP_KERNEL);
|
GFP_KERNEL);
|
||||||
if (!serial->rx_data[i]) {
|
if (!serial->rx_data[i])
|
||||||
dev_err(dev, "%s - Out of memory\n", __func__);
|
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/* TX, allocate urb and initialize */
|
/* TX, allocate urb and initialize */
|
||||||
serial->tx_urb = usb_alloc_urb(0, GFP_KERNEL);
|
serial->tx_urb = usb_alloc_urb(0, GFP_KERNEL);
|
||||||
@ -2336,15 +2334,12 @@ static int hso_serial_common_create(struct hso_serial *serial, int num_urbs,
|
|||||||
serial->tx_buffer_count = 0;
|
serial->tx_buffer_count = 0;
|
||||||
serial->tx_data_length = tx_size;
|
serial->tx_data_length = tx_size;
|
||||||
serial->tx_data = kzalloc(serial->tx_data_length, GFP_KERNEL);
|
serial->tx_data = kzalloc(serial->tx_data_length, GFP_KERNEL);
|
||||||
if (!serial->tx_data) {
|
if (!serial->tx_data)
|
||||||
dev_err(dev, "%s - Out of memory\n", __func__);
|
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
|
||||||
serial->tx_buffer = kzalloc(serial->tx_data_length, GFP_KERNEL);
|
serial->tx_buffer = kzalloc(serial->tx_data_length, GFP_KERNEL);
|
||||||
if (!serial->tx_buffer) {
|
if (!serial->tx_buffer)
|
||||||
dev_err(dev, "%s - Out of memory\n", __func__);
|
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
exit:
|
exit:
|
||||||
@ -2580,21 +2575,17 @@ 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,
|
hso_net->mux_bulk_rx_buf_pool[i] = kzalloc(MUX_BULK_RX_BUF_SIZE,
|
||||||
GFP_KERNEL);
|
GFP_KERNEL);
|
||||||
if (!hso_net->mux_bulk_rx_buf_pool[i]) {
|
if (!hso_net->mux_bulk_rx_buf_pool[i])
|
||||||
dev_err(&interface->dev, "Could not allocate rx buf\n");
|
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
hso_net->mux_bulk_tx_urb = usb_alloc_urb(0, GFP_KERNEL);
|
hso_net->mux_bulk_tx_urb = usb_alloc_urb(0, GFP_KERNEL);
|
||||||
if (!hso_net->mux_bulk_tx_urb) {
|
if (!hso_net->mux_bulk_tx_urb) {
|
||||||
dev_err(&interface->dev, "Could not allocate tx urb\n");
|
dev_err(&interface->dev, "Could not allocate tx urb\n");
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
}
|
||||||
hso_net->mux_bulk_tx_buf = kzalloc(MUX_BULK_TX_BUF_SIZE, GFP_KERNEL);
|
hso_net->mux_bulk_tx_buf = kzalloc(MUX_BULK_TX_BUF_SIZE, GFP_KERNEL);
|
||||||
if (!hso_net->mux_bulk_tx_buf) {
|
if (!hso_net->mux_bulk_tx_buf)
|
||||||
dev_err(&interface->dev, "Could not allocate tx buf\n");
|
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
|
||||||
|
|
||||||
add_net_device(hso_dev);
|
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 =
|
mux->shared_intr_buf =
|
||||||
kzalloc(le16_to_cpu(mux->intr_endp->wMaxPacketSize),
|
kzalloc(le16_to_cpu(mux->intr_endp->wMaxPacketSize),
|
||||||
GFP_KERNEL);
|
GFP_KERNEL);
|
||||||
if (!mux->shared_intr_buf) {
|
if (!mux->shared_intr_buf)
|
||||||
dev_err(&interface->dev, "Could not allocate intr buf?\n");
|
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
|
||||||
|
|
||||||
mutex_init(&mux->shared_int_lock);
|
mutex_init(&mux->shared_int_lock);
|
||||||
|
|
||||||
|
@ -459,11 +459,9 @@ static void sierra_net_kevent(struct work_struct *work)
|
|||||||
|
|
||||||
/* Query the modem for the LSI message */
|
/* Query the modem for the LSI message */
|
||||||
buf = kzalloc(SIERRA_NET_USBCTL_BUF_LEN, GFP_KERNEL);
|
buf = kzalloc(SIERRA_NET_USBCTL_BUF_LEN, GFP_KERNEL);
|
||||||
if (!buf) {
|
if (!buf)
|
||||||
netdev_err(dev->net,
|
|
||||||
"failed to allocate buf for LS msg\n");
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
ifnum = priv->ifnum;
|
ifnum = priv->ifnum;
|
||||||
len = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0),
|
len = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0),
|
||||||
USB_CDC_GET_ENCAPSULATED_RESPONSE,
|
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 */
|
/* Initialize sierra private data */
|
||||||
priv = kzalloc(sizeof *priv, GFP_KERNEL);
|
priv = kzalloc(sizeof *priv, GFP_KERNEL);
|
||||||
if (!priv) {
|
if (!priv)
|
||||||
dev_err(&dev->udev->dev, "No memory");
|
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
|
||||||
|
|
||||||
priv->usbnet = dev;
|
priv->usbnet = dev;
|
||||||
priv->ifnum = ifacenum;
|
priv->ifnum = ifacenum;
|
||||||
|
@ -1396,10 +1396,8 @@ static int smsc75xx_bind(struct usbnet *dev, struct usb_interface *intf)
|
|||||||
GFP_KERNEL);
|
GFP_KERNEL);
|
||||||
|
|
||||||
pdata = (struct smsc75xx_priv *)(dev->data[0]);
|
pdata = (struct smsc75xx_priv *)(dev->data[0]);
|
||||||
if (!pdata) {
|
if (!pdata)
|
||||||
netdev_warn(dev->net, "Unable to allocate smsc75xx_priv\n");
|
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
|
||||||
|
|
||||||
pdata->dev = dev;
|
pdata->dev = dev;
|
||||||
|
|
||||||
|
@ -1119,10 +1119,8 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf)
|
|||||||
GFP_KERNEL);
|
GFP_KERNEL);
|
||||||
|
|
||||||
pdata = (struct smsc95xx_priv *)(dev->data[0]);
|
pdata = (struct smsc95xx_priv *)(dev->data[0]);
|
||||||
if (!pdata) {
|
if (!pdata)
|
||||||
netdev_warn(dev->net, "Unable to allocate struct smsc95xx_priv\n");
|
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
|
||||||
|
|
||||||
spin_lock_init(&pdata->mac_cr_lock);
|
spin_lock_init(&pdata->mac_cr_lock);
|
||||||
|
|
||||||
|
@ -1790,11 +1790,8 @@ int usbnet_write_cmd_async(struct usbnet *dev, u8 cmd, u8 reqtype,
|
|||||||
}
|
}
|
||||||
|
|
||||||
req = kmalloc(sizeof(struct usb_ctrlrequest), GFP_ATOMIC);
|
req = kmalloc(sizeof(struct usb_ctrlrequest), GFP_ATOMIC);
|
||||||
if (!req) {
|
if (!req)
|
||||||
netdev_err(dev->net, "Failed to allocate memory for %s\n",
|
|
||||||
__func__);
|
|
||||||
goto fail_free_buf;
|
goto fail_free_buf;
|
||||||
}
|
|
||||||
|
|
||||||
req->bRequestType = reqtype;
|
req->bRequestType = reqtype;
|
||||||
req->bRequest = cmd;
|
req->bRequest = cmd;
|
||||||
|
Loading…
Reference in New Issue
Block a user