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

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

can: Remove unnecessary alloc/OOM messages 



alloc failures already get standardized OOM
messages and a dump_stack.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ad4437d4

drivers/net/can/sja1000/ems_pci.c

+0 −1
Original line number Diff line number Diff line
@@ -238,7 +238,6 @@ static int ems_pci_add_card(struct pci_dev *pdev, 
	/* Allocating card structures to hold addresses, ... */

	card = kzalloc(sizeof(struct ems_pci_card), GFP_KERNEL);

	if (card == NULL) {

		dev_err(&pdev->dev, "Unable to allocate memory\n");

		pci_disable_device(pdev);

		return -ENOMEM;

	}

drivers/net/can/sja1000/peak_pci.c

+1 −4
Original line number Diff line number Diff line
@@ -451,11 +451,8 @@ static int peak_pciec_probe(struct pci_dev *pdev, struct net_device *dev) 
	} else {

		/* create the bit banging I2C adapter structure */

		card = kzalloc(sizeof(struct peak_pciec_card), GFP_KERNEL);

		if (!card) {

			dev_err(&pdev->dev,

				 "failed allocating memory for i2c chip\n");

		if (!card)

			return -ENOMEM;

		}



		card->cfg_base = chan->cfg_base;

		card->reg_base = priv->reg_base;

drivers/net/can/sja1000/peak_pcmcia.c

+0 −1
Original line number Diff line number Diff line
@@ -660,7 +660,6 @@ static int pcan_probe(struct pcmcia_device *pdev) 


	card = kzalloc(sizeof(struct pcan_pccard), GFP_KERNEL);

	if (!card) {

		dev_err(&pdev->dev, "couldn't allocate card memory\n");

		err = -ENOMEM;

		goto probe_err_2;

	}

drivers/net/can/sja1000/plx_pci.c

+0 −1
Original line number Diff line number Diff line
@@ -508,7 +508,6 @@ static int plx_pci_add_card(struct pci_dev *pdev, 
	/* Allocate card structures to hold addresses, ... */

	card = kzalloc(sizeof(*card), GFP_KERNEL);

	if (!card) {

		dev_err(&pdev->dev, "Unable to allocate memory\n");

		pci_disable_device(pdev);

		return -ENOMEM;

	}

drivers/net/can/usb/ems_usb.c

+1 −3
Original line number Diff line number Diff line
@@ -1014,10 +1014,8 @@ static int ems_usb_probe(struct usb_interface *intf, 
	}



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

	if (!dev->intr_in_buffer) {

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

	if (!dev->intr_in_buffer)

		goto cleanup_intr_urb;

	}



	dev->tx_msg_buffer = kzalloc(CPC_HEADER_SIZE +

				     sizeof(struct ems_cpc_msg), GFP_KERNEL);