diff options
author | Joe Perches <joe@perches.com> | 2011-08-25 09:22:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-08-28 17:16:13 -0400 |
commit | 7ac2ed0ceeafa130f85aa947b271b571c68b9e75 (patch) | |
tree | 7f08a891990d46c84b0dd6b665fc0a70451fb6b2 /drivers/net/caif | |
parent | 343e43c02850a3abcd22bd144e5bdbc92fdd273c (diff) |
caif: Remove OOM messages, use kzalloc
Remove per site OOM messages because they duplicate
the generic mm subsystem OOM message.
Use kzalloc instead of kmalloc/memset
when next to the OOM message removals.
Reduces object size (allyesconfig ~2%)
$ size -t drivers/net/caif/built-in.o.old net/caif/built-in.o.old
text data bss dec hex filename
32297 700 8224 41221 a105 drivers/net/caif/built-in.o.old
72159 1317 20552 94028 16f4c net/caif/built-in.o.old
104456 2017 28776 135249 21051 (TOTALS)
$ size -t drivers/net/caif/built-in.o.new net/caif/built-in.o.new
text data bss dec hex filename
31975 700 8184 40859 9f9b drivers/net/caif/built-in.o.new
70748 1317 20152 92217 16839 net/caif/built-in.o.new
102723 2017 28336 133076 207d4 (TOTALS)
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/caif')
-rw-r--r-- | drivers/net/caif/caif_hsi.c | 9 | ||||
-rw-r--r-- | drivers/net/caif/caif_spi.c | 4 |
2 files changed, 1 insertions, 12 deletions
diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c index b41c2fced0a7..2fcabba56087 100644 --- a/drivers/net/caif/caif_hsi.c +++ b/drivers/net/caif/caif_hsi.c | |||
@@ -937,11 +937,8 @@ int cfhsi_probe(struct platform_device *pdev) | |||
937 | int res; | 937 | int res; |
938 | 938 | ||
939 | ndev = alloc_netdev(sizeof(struct cfhsi), "cfhsi%d", cfhsi_setup); | 939 | ndev = alloc_netdev(sizeof(struct cfhsi), "cfhsi%d", cfhsi_setup); |
940 | if (!ndev) { | 940 | if (!ndev) |
941 | dev_err(&pdev->dev, "%s: alloc_netdev failed.\n", | ||
942 | __func__); | ||
943 | return -ENODEV; | 941 | return -ENODEV; |
944 | } | ||
945 | 942 | ||
946 | cfhsi = netdev_priv(ndev); | 943 | cfhsi = netdev_priv(ndev); |
947 | cfhsi->ndev = ndev; | 944 | cfhsi->ndev = ndev; |
@@ -969,8 +966,6 @@ int cfhsi_probe(struct platform_device *pdev) | |||
969 | */ | 966 | */ |
970 | cfhsi->tx_buf = kzalloc(CFHSI_BUF_SZ_TX, GFP_KERNEL); | 967 | cfhsi->tx_buf = kzalloc(CFHSI_BUF_SZ_TX, GFP_KERNEL); |
971 | if (!cfhsi->tx_buf) { | 968 | if (!cfhsi->tx_buf) { |
972 | dev_err(&ndev->dev, "%s: Failed to allocate TX buffer.\n", | ||
973 | __func__); | ||
974 | res = -ENODEV; | 969 | res = -ENODEV; |
975 | goto err_alloc_tx; | 970 | goto err_alloc_tx; |
976 | } | 971 | } |
@@ -981,8 +976,6 @@ int cfhsi_probe(struct platform_device *pdev) | |||
981 | */ | 976 | */ |
982 | cfhsi->rx_buf = kzalloc(CFHSI_BUF_SZ_RX, GFP_KERNEL); | 977 | cfhsi->rx_buf = kzalloc(CFHSI_BUF_SZ_RX, GFP_KERNEL); |
983 | if (!cfhsi->rx_buf) { | 978 | if (!cfhsi->rx_buf) { |
984 | dev_err(&ndev->dev, "%s: Failed to allocate RX buffer.\n", | ||
985 | __func__); | ||
986 | res = -ENODEV; | 979 | res = -ENODEV; |
987 | goto err_alloc_rx; | 980 | goto err_alloc_rx; |
988 | } | 981 | } |
diff --git a/drivers/net/caif/caif_spi.c b/drivers/net/caif/caif_spi.c index 0f8defc73307..05e791f46aef 100644 --- a/drivers/net/caif/caif_spi.c +++ b/drivers/net/caif/caif_spi.c | |||
@@ -664,8 +664,6 @@ int cfspi_spi_probe(struct platform_device *pdev) | |||
664 | /* Allocate DMA buffers. */ | 664 | /* Allocate DMA buffers. */ |
665 | cfspi->xfer.va_tx = dma_alloc(&cfspi->xfer.pa_tx); | 665 | cfspi->xfer.va_tx = dma_alloc(&cfspi->xfer.pa_tx); |
666 | if (!cfspi->xfer.va_tx) { | 666 | if (!cfspi->xfer.va_tx) { |
667 | printk(KERN_WARNING | ||
668 | "CFSPI: failed to allocate dma TX buffer.\n"); | ||
669 | res = -ENODEV; | 667 | res = -ENODEV; |
670 | goto err_dma_alloc_tx; | 668 | goto err_dma_alloc_tx; |
671 | } | 669 | } |
@@ -673,8 +671,6 @@ int cfspi_spi_probe(struct platform_device *pdev) | |||
673 | cfspi->xfer.va_rx = dma_alloc(&cfspi->xfer.pa_rx); | 671 | cfspi->xfer.va_rx = dma_alloc(&cfspi->xfer.pa_rx); |
674 | 672 | ||
675 | if (!cfspi->xfer.va_rx) { | 673 | if (!cfspi->xfer.va_rx) { |
676 | printk(KERN_WARNING | ||
677 | "CFSPI: failed to allocate dma TX buffer.\n"); | ||
678 | res = -ENODEV; | 674 | res = -ENODEV; |
679 | goto err_dma_alloc_rx; | 675 | goto err_dma_alloc_rx; |
680 | } | 676 | } |