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

Commit b2adaca9 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

ethernet: Remove unnecessary alloc/OOM messages, alloc cleanups 



alloc failures already get standardized OOM
messages and a dump_stack.

Convert kzalloc's with multiplies to kcalloc.
Convert kmalloc's with multiplies to kmalloc_array.
Fix a few whitespace defects.
Convert a constant 6 to ETH_ALEN.
Use parentheses around sizeof.
Convert vmalloc/memset to vzalloc.
Remove now unused size variables.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 09da6c5f

drivers/net/ethernet/atheros/atl1c/atl1c_main.c

+2 −4
Original line number Diff line number Diff line
@@ -982,11 +982,9 @@ static int atl1c_setup_ring_resources(struct atl1c_adapter *adapter) 
	size = sizeof(struct atl1c_buffer) * (tpd_ring->count * 2 +

		rfd_ring->count);

	tpd_ring->buffer_info = kzalloc(size, GFP_KERNEL);

	if (unlikely(!tpd_ring->buffer_info)) {

		dev_err(&pdev->dev, "kzalloc failed, size = %d\n",

			size);

	if (unlikely(!tpd_ring->buffer_info))

		goto err_nomem;

	}



	for (i = 0; i < AT_MAX_TRANSMIT_QUEUE; i++) {

		tpd_ring[i].buffer_info =

			(tpd_ring->buffer_info + count);

drivers/net/ethernet/atheros/atl1e/atl1e_main.c

+0 −2
Original line number Diff line number Diff line
@@ -819,8 +819,6 @@ static int atl1e_setup_ring_resources(struct atl1e_adapter *adapter) 
	size = sizeof(struct atl1e_tx_buffer) * (tx_ring->count);

	tx_ring->tx_buffer = kzalloc(size, GFP_KERNEL);

	if (tx_ring->tx_buffer == NULL) {

		netdev_err(adapter->netdev, "kzalloc failed, size = D%d\n",

			   size);

		err = -ENOMEM;

		goto failed;

	}

drivers/net/ethernet/broadcom/b44.c

+1 −3
Original line number Diff line number Diff line
@@ -1518,10 +1518,8 @@ static void b44_setup_pseudo_magicp(struct b44 *bp) 
	u8 pwol_mask[B44_PMASK_SIZE];



	pwol_pattern = kzalloc(B44_PATTERN_SIZE, GFP_KERNEL);

	if (!pwol_pattern) {

		pr_err("Memory not available for WOL\n");

	if (!pwol_pattern)

		return;

	}



	/* Ipv4 magic packet pattern - pattern 0.*/

	memset(pwol_mask, 0, B44_PMASK_SIZE);

drivers/net/ethernet/broadcom/bcm63xx_enet.c

+2 −4
Original line number Diff line number Diff line
@@ -886,10 +886,9 @@ static int bcm_enet_open(struct net_device *dev) 
	priv->tx_desc_alloc_size = size;

	priv->tx_desc_cpu = p;



	priv->tx_skb = kzalloc(sizeof(struct sk_buff *) * priv->tx_ring_size,

	priv->tx_skb = kcalloc(priv->tx_ring_size, sizeof(struct sk_buff *),

			       GFP_KERNEL);

	if (!priv->tx_skb) {

		dev_err(kdev, "cannot allocate rx skb queue\n");

		ret = -ENOMEM;

		goto out_free_tx_ring;

	}
@@ -900,10 +899,9 @@ static int bcm_enet_open(struct net_device *dev) 
	spin_lock_init(&priv->tx_lock);



	/* init & fill rx ring with skbs */

	priv->rx_skb = kzalloc(sizeof(struct sk_buff *) * priv->rx_ring_size,

	priv->rx_skb = kcalloc(priv->rx_ring_size, sizeof(struct sk_buff *),

			       GFP_KERNEL);

	if (!priv->rx_skb) {

		dev_err(kdev, "cannot allocate rx skb queue\n");

		ret = -ENOMEM;

		goto out_free_tx_skb;

	}

drivers/net/ethernet/broadcom/cnic.c

+2 −4
Original line number Diff line number Diff line
@@ -5426,10 +5426,8 @@ static struct cnic_dev *cnic_alloc_dev(struct net_device *dev, 
	alloc_size = sizeof(struct cnic_dev) + sizeof(struct cnic_local);



	cdev = kzalloc(alloc_size, GFP_KERNEL);

	if (cdev == NULL) {

		netdev_err(dev, "allocate dev struct failure\n");

	if (cdev == NULL)

		return NULL;

	}



	cdev->netdev = dev;

	cdev->cnic_priv = (char *)cdev + sizeof(struct cnic_dev);