diff options
| author | Joe Perches <joe@perches.com> | 2011-08-25 13:22:24 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-28 17:16:13 -0400 |
| commit | 7ac2ed0ceeafa130f85aa947b271b571c68b9e75 (patch) | |
| tree | 7f08a891990d46c84b0dd6b665fc0a70451fb6b2 /drivers | |
| 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')
| -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 b41c2fced0a..2fcabba5608 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) int res; ndev = alloc_netdev(sizeof(struct cfhsi), "cfhsi%d", cfhsi_setup); - if (!ndev) { - dev_err(&pdev->dev, "%s: alloc_netdev failed.\n", - __func__); + if (!ndev) return -ENODEV; - } cfhsi = netdev_priv(ndev); cfhsi->ndev = ndev; @@ -969,8 +966,6 @@ int cfhsi_probe(struct platform_device *pdev) */ cfhsi->tx_buf = kzalloc(CFHSI_BUF_SZ_TX, GFP_KERNEL); if (!cfhsi->tx_buf) { - dev_err(&ndev->dev, "%s: Failed to allocate TX buffer.\n", - __func__); res = -ENODEV; goto err_alloc_tx; } @@ -981,8 +976,6 @@ int cfhsi_probe(struct platform_device *pdev) */ cfhsi->rx_buf = kzalloc(CFHSI_BUF_SZ_RX, GFP_KERNEL); if (!cfhsi->rx_buf) { - dev_err(&ndev->dev, "%s: Failed to allocate RX buffer.\n", - __func__); res = -ENODEV; goto err_alloc_rx; } diff --git a/drivers/net/caif/caif_spi.c b/drivers/net/caif/caif_spi.c index 0f8defc7330..05e791f46ae 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) /* Allocate DMA buffers. */ cfspi->xfer.va_tx = dma_alloc(&cfspi->xfer.pa_tx); if (!cfspi->xfer.va_tx) { - printk(KERN_WARNING - "CFSPI: failed to allocate dma TX buffer.\n"); res = -ENODEV; goto err_dma_alloc_tx; } @@ -673,8 +671,6 @@ int cfspi_spi_probe(struct platform_device *pdev) cfspi->xfer.va_rx = dma_alloc(&cfspi->xfer.pa_rx); if (!cfspi->xfer.va_rx) { - printk(KERN_WARNING - "CFSPI: failed to allocate dma TX buffer.\n"); res = -ENODEV; goto err_dma_alloc_rx; } |