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

Commit 5628d98f authored by Joe Perches's avatar Joe Perches Committed by Michael Grzeschik
Browse files

arcnet: Remove unnecessary OOM messages



Alloc failures have generic stack dumps so these are redundant.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarMichael Grzeschik <m.grzeschik@pengutronix.de>
parent 811eafc0
Loading
Loading
Loading
Loading
+0 −1
Original line number Original line Diff line number Diff line
@@ -98,7 +98,6 @@ static void rx(struct net_device *dev, int bufnum,


	skb = alloc_skb(length + ARC_HDR_SIZE, GFP_ATOMIC);
	skb = alloc_skb(length + ARC_HDR_SIZE, GFP_ATOMIC);
	if (skb == NULL) {
	if (skb == NULL) {
		arc_printk(D_NORMAL, dev, "Memory squeeze, dropping packet\n");
		dev->stats.rx_dropped++;
		dev->stats.rx_dropped++;
		return;
		return;
	}
	}
+1 −4
Original line number Original line Diff line number Diff line
@@ -57,7 +57,6 @@ static void rx(struct net_device *dev, int bufnum,


	skb = alloc_skb(length + ARC_HDR_SIZE + sizeof(int), GFP_ATOMIC);
	skb = alloc_skb(length + ARC_HDR_SIZE + sizeof(int), GFP_ATOMIC);
	if (skb == NULL) {
	if (skb == NULL) {
		arc_printk(D_NORMAL, dev, "Memory squeeze, dropping packet\n");
		dev->stats.rx_dropped++;
		dev->stats.rx_dropped++;
		return;
		return;
	}
	}
@@ -197,10 +196,8 @@ static int ack_tx(struct net_device *dev, int acked)


	/* Now alloc a skb to send back up through the layers: */
	/* Now alloc a skb to send back up through the layers: */
	ackskb = alloc_skb(length + ARC_HDR_SIZE, GFP_ATOMIC);
	ackskb = alloc_skb(length + ARC_HDR_SIZE, GFP_ATOMIC);
	if (ackskb == NULL) {
	if (ackskb == NULL)
		arc_printk(D_NORMAL, dev, "Memory squeeze, can't acknowledge\n");
		goto free_outskb;
		goto free_outskb;
	}


	skb_put(ackskb, length + ARC_HDR_SIZE);
	skb_put(ackskb, length + ARC_HDR_SIZE);
	ackskb->dev = dev;
	ackskb->dev = dev;
+1 −3
Original line number Original line Diff line number Diff line
@@ -142,10 +142,8 @@ static int com20020pci_probe(struct pci_dev *pdev, const struct pci_device_id *i


		card = devm_kzalloc(&pdev->dev, sizeof(struct com20020_dev),
		card = devm_kzalloc(&pdev->dev, sizeof(struct com20020_dev),
				    GFP_KERNEL);
				    GFP_KERNEL);
		if (!card) {
		if (!card)
			pr_err("%s out of memory!\n", __func__);
			return -ENOMEM;
			return -ENOMEM;
		}


		card->index = i;
		card->index = i;
		card->pci_priv = priv;
		card->pci_priv = priv;
+0 −1
Original line number Original line Diff line number Diff line
@@ -134,7 +134,6 @@ static void rx(struct net_device *dev, int bufnum,


	skb = alloc_skb(length + ARC_HDR_SIZE, GFP_ATOMIC);
	skb = alloc_skb(length + ARC_HDR_SIZE, GFP_ATOMIC);
	if (skb == NULL) {
	if (skb == NULL) {
		arc_printk(D_NORMAL, dev, "Memory squeeze, dropping packet\n");
		dev->stats.rx_dropped++;
		dev->stats.rx_dropped++;
		return;
		return;
	}
	}
+0 −1
Original line number Original line Diff line number Diff line
@@ -179,7 +179,6 @@ static void rx(struct net_device *dev, int bufnum,


		skb = alloc_skb(length + ARC_HDR_SIZE, GFP_ATOMIC);
		skb = alloc_skb(length + ARC_HDR_SIZE, GFP_ATOMIC);
		if (skb == NULL) {
		if (skb == NULL) {
			arc_printk(D_NORMAL, dev, "Memory squeeze, dropping packet\n");
			dev->stats.rx_dropped++;
			dev->stats.rx_dropped++;
			return;
			return;
		}
		}