Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

can: Remove unnecessary alloc/OOM messages

alloc failures already get standardized OOM
messages and a dump_stack.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Joe Perches and committed by
David S. Miller
09da6c5f ad4437d4

+3 -20
-1
drivers/net/can/sja1000/ems_pci.c
··· 238 238 /* Allocating card structures to hold addresses, ... */ 239 239 card = kzalloc(sizeof(struct ems_pci_card), GFP_KERNEL); 240 240 if (card == NULL) { 241 - dev_err(&pdev->dev, "Unable to allocate memory\n"); 242 241 pci_disable_device(pdev); 243 242 return -ENOMEM; 244 243 }
+1 -4
drivers/net/can/sja1000/peak_pci.c
··· 451 451 } else { 452 452 /* create the bit banging I2C adapter structure */ 453 453 card = kzalloc(sizeof(struct peak_pciec_card), GFP_KERNEL); 454 - if (!card) { 455 - dev_err(&pdev->dev, 456 - "failed allocating memory for i2c chip\n"); 454 + if (!card) 457 455 return -ENOMEM; 458 - } 459 456 460 457 card->cfg_base = chan->cfg_base; 461 458 card->reg_base = priv->reg_base;
-1
drivers/net/can/sja1000/peak_pcmcia.c
··· 660 660 661 661 card = kzalloc(sizeof(struct pcan_pccard), GFP_KERNEL); 662 662 if (!card) { 663 - dev_err(&pdev->dev, "couldn't allocate card memory\n"); 664 663 err = -ENOMEM; 665 664 goto probe_err_2; 666 665 }
-1
drivers/net/can/sja1000/plx_pci.c
··· 508 508 /* Allocate card structures to hold addresses, ... */ 509 509 card = kzalloc(sizeof(*card), GFP_KERNEL); 510 510 if (!card) { 511 - dev_err(&pdev->dev, "Unable to allocate memory\n"); 512 511 pci_disable_device(pdev); 513 512 return -ENOMEM; 514 513 }
+1 -3
drivers/net/can/usb/ems_usb.c
··· 1014 1014 } 1015 1015 1016 1016 dev->intr_in_buffer = kzalloc(INTR_IN_BUFFER_SIZE, GFP_KERNEL); 1017 - if (!dev->intr_in_buffer) { 1018 - dev_err(&intf->dev, "Couldn't alloc Intr buffer\n"); 1017 + if (!dev->intr_in_buffer) 1019 1018 goto cleanup_intr_urb; 1020 - } 1021 1019 1022 1020 dev->tx_msg_buffer = kzalloc(CPC_HEADER_SIZE + 1023 1021 sizeof(struct ems_cpc_msg), GFP_KERNEL);
-2
drivers/net/can/usb/kvaser_usb.c
··· 561 561 562 562 buf = kmalloc(sizeof(struct kvaser_msg), GFP_ATOMIC); 563 563 if (!buf) { 564 - netdev_err(netdev, "No memory left for USB buffer\n"); 565 564 usb_free_urb(urb); 566 565 return -ENOMEM; 567 566 } ··· 1267 1268 1268 1269 buf = kmalloc(sizeof(struct kvaser_msg), GFP_ATOMIC); 1269 1270 if (!buf) { 1270 - netdev_err(netdev, "No memory left for USB buffer\n"); 1271 1271 stats->tx_dropped++; 1272 1272 goto nobufmem; 1273 1273 }
-5
drivers/net/can/usb/peak_usb/pcan_usb_core.c
··· 386 386 387 387 buf = kmalloc(dev->adapter->rx_buffer_size, GFP_KERNEL); 388 388 if (!buf) { 389 - netdev_err(netdev, "No memory left for USB buffer\n"); 390 389 usb_free_urb(urb); 391 390 err = -ENOMEM; 392 391 break; ··· 441 442 442 443 buf = kmalloc(dev->adapter->tx_buffer_size, GFP_KERNEL); 443 444 if (!buf) { 444 - netdev_err(netdev, "No memory left for USB buffer\n"); 445 445 usb_free_urb(urb); 446 446 err = -ENOMEM; 447 447 break; ··· 632 634 /* also allocate enough space for the commands to send */ 633 635 buf = kmalloc(PCAN_USB_MAX_CMD_LEN, GFP_ATOMIC); 634 636 if (!buf) { 635 - netdev_err(dev->netdev, "no memory left for async cmd\n"); 636 637 usb_free_urb(urb); 637 638 return -ENOMEM; 638 639 } ··· 726 729 /* allocate a buffer large enough to send commands */ 727 730 dev->cmd_buf = kmalloc(PCAN_USB_MAX_CMD_LEN, GFP_KERNEL); 728 731 if (!dev->cmd_buf) { 729 - dev_err(&intf->dev, "%s: couldn't alloc cmd buffer\n", 730 - PCAN_USB_DRIVER_NAME); 731 732 err = -ENOMEM; 732 733 goto lbl_set_intf_data; 733 734 }
+1 -3
drivers/net/can/usb/usb_8dev.c
··· 958 958 959 959 priv->cmd_msg_buffer = kzalloc(sizeof(struct usb_8dev_cmd_msg), 960 960 GFP_KERNEL); 961 - if (!priv->cmd_msg_buffer) { 962 - netdev_err(netdev, "Couldn't alloc Tx buffer\n"); 961 + if (!priv->cmd_msg_buffer) 963 962 goto cleanup_candev; 964 - } 965 963 966 964 usb_set_intfdata(intf, priv); 967 965