Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70567833 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-urb-alloc-failure' 



Wolfram Sang says:

====================
net: don't print error when allocating urb fails

This per-subsystem series is part of a tree wide cleanup. usb_alloc_urb() uses
kmalloc which already prints enough information on failure. So, let's simply
remove those "allocation failed" messages from drivers like we did already for
other -ENOMEM cases. gkh acked this approach when we talked about it at LCJ in
Tokyo a few weeks ago.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6176e89c eb363338

drivers/net/can/usb/ems_usb.c

+2 −7
Original line number Diff line number Diff line
@@ -600,7 +600,6 @@ static int ems_usb_start(struct ems_usb *dev) 
		/* create a URB, and a buffer for it */

		urb = usb_alloc_urb(0, GFP_KERNEL);

		if (!urb) {

			netdev_err(netdev, "No memory left for URBs\n");

			err = -ENOMEM;

			break;

		}
@@ -752,10 +751,8 @@ static netdev_tx_t ems_usb_start_xmit(struct sk_buff *skb, struct net_device *ne 


	/* create a URB, and a buffer for it, and copy the data to the URB */

	urb = usb_alloc_urb(0, GFP_ATOMIC);

	if (!urb) {

		netdev_err(netdev, "No memory left for URBs\n");

	if (!urb)

		goto nomem;

	}



	buf = usb_alloc_coherent(dev->udev, size, GFP_ATOMIC, &urb->transfer_dma);

	if (!buf) {
@@ -1007,10 +1004,8 @@ static int ems_usb_probe(struct usb_interface *intf, 
		dev->tx_contexts[i].echo_index = MAX_TX_URBS;



	dev->intr_urb = usb_alloc_urb(0, GFP_KERNEL);

	if (!dev->intr_urb) {

		dev_err(&intf->dev, "Couldn't alloc intr URB\n");

	if (!dev->intr_urb)

		goto cleanup_candev;

	}



	dev->intr_in_buffer = kzalloc(INTR_IN_BUFFER_SIZE, GFP_KERNEL);

	if (!dev->intr_in_buffer)

drivers/net/can/usb/esd_usb2.c

+0 −3
Original line number Diff line number Diff line
@@ -558,8 +558,6 @@ static int esd_usb2_setup_rx_urbs(struct esd_usb2 *dev) 
		/* create a URB, and a buffer for it */

		urb = usb_alloc_urb(0, GFP_KERNEL);

		if (!urb) {

			dev_warn(dev->udev->dev.parent,

				 "No memory left for URBs\n");

			err = -ENOMEM;

			break;

		}
@@ -730,7 +728,6 @@ static netdev_tx_t esd_usb2_start_xmit(struct sk_buff *skb, 
	/* create a URB, and a buffer for it, and copy the data to the URB */

	urb = usb_alloc_urb(0, GFP_ATOMIC);

	if (!urb) {

		netdev_err(netdev, "No memory left for URBs\n");

		stats->tx_dropped++;

		dev_kfree_skb(skb);

		goto nourbmem;

drivers/net/can/usb/gs_usb.c

+2 −7
Original line number Diff line number Diff line
@@ -493,10 +493,8 @@ static netdev_tx_t gs_can_start_xmit(struct sk_buff *skb, 


	/* create a URB, and a buffer for it */

	urb = usb_alloc_urb(0, GFP_ATOMIC);

	if (!urb) {

		netdev_err(netdev, "No memory left for URB\n");

	if (!urb)

		goto nomem_urb;

	}



	hf = usb_alloc_coherent(dev->udev, sizeof(*hf), GFP_ATOMIC,

				&urb->transfer_dma);
@@ -600,11 +598,8 @@ static int gs_can_open(struct net_device *netdev) 


			/* alloc rx urb */

			urb = usb_alloc_urb(0, GFP_KERNEL);

			if (!urb) {

				netdev_err(netdev,

					   "No memory left for URB\n");

			if (!urb)

				return -ENOMEM;

			}



			/* alloc rx buffer */

			buf = usb_alloc_coherent(dev->udev,

drivers/net/can/usb/kvaser_usb.c

+1 −6
Original line number Diff line number Diff line
@@ -787,10 +787,8 @@ static int kvaser_usb_simple_msg_async(struct kvaser_usb_net_priv *priv, 
	int err;



	urb = usb_alloc_urb(0, GFP_ATOMIC);

	if (!urb) {

		netdev_err(netdev, "No memory left for URBs\n");

	if (!urb)

		return -ENOMEM;

	}



	buf = kmalloc(sizeof(struct kvaser_msg), GFP_ATOMIC);

	if (!buf) {
@@ -1393,8 +1391,6 @@ static int kvaser_usb_setup_rx_urbs(struct kvaser_usb *dev) 


		urb = usb_alloc_urb(0, GFP_KERNEL);

		if (!urb) {

			dev_warn(dev->udev->dev.parent,

				 "No memory left for URBs\n");

			err = -ENOMEM;

			break;

		}
@@ -1670,7 +1666,6 @@ static netdev_tx_t kvaser_usb_start_xmit(struct sk_buff *skb, 


	urb = usb_alloc_urb(0, GFP_ATOMIC);

	if (!urb) {

		netdev_err(netdev, "No memory left for URBs\n");

		stats->tx_dropped++;

		dev_kfree_skb(skb);

		return NETDEV_TX_OK;

drivers/net/can/usb/peak_usb/pcan_usb_core.c

+1 −5
Original line number Diff line number Diff line
@@ -399,7 +399,6 @@ static int peak_usb_start(struct peak_usb_device *dev) 
		/* create a URB, and a buffer for it, to receive usb messages */

		urb = usb_alloc_urb(0, GFP_KERNEL);

		if (!urb) {

			netdev_err(netdev, "No memory left for URBs\n");

			err = -ENOMEM;

			break;

		}
@@ -454,7 +453,6 @@ static int peak_usb_start(struct peak_usb_device *dev) 
		/* create a URB and a buffer for it, to transmit usb messages */

		urb = usb_alloc_urb(0, GFP_KERNEL);

		if (!urb) {

			netdev_err(netdev, "No memory left for URBs\n");

			err = -ENOMEM;

			break;

		}
@@ -651,10 +649,8 @@ static int peak_usb_restart(struct peak_usb_device *dev) 


	/* first allocate a urb to handle the asynchronous steps */

	urb = usb_alloc_urb(0, GFP_ATOMIC);

	if (!urb) {

		netdev_err(dev->netdev, "no memory left for urb\n");

	if (!urb)

		return -ENOMEM;

	}



	/* also allocate enough space for the commands to send */

	buf = kmalloc(PCAN_USB_MAX_CMD_LEN, GFP_ATOMIC);