aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/smsc
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-02-07 06:46:27 -0500
committerDavid S. Miller <davem@davemloft.net>2013-02-08 17:44:39 -0500
commit14f8dc49532f765968ff37c3b99edbeb99004ace (patch)
treea0c2f42ca545b3587a071ad05427c7351c8244e0 /drivers/net/ethernet/smsc
parente9ba103931950da7bc87d58ffe39612df17d47af (diff)
drivers: net: Remove remaining alloc/OOM messages
alloc failures already get standardized OOM messages and a dump_stack. For the affected mallocs around these OOM messages: Converted kmallocs with multiplies to kmalloc_array. Converted a kmalloc/memcpy to kmemdup. Removed now unused stack variables. Removed unnecessary parentheses. Neatened alignment. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Arend van Spriel <arend@broadcom.com> Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> Acked-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/smsc')
-rw-r--r--drivers/net/ethernet/smsc/smsc9420.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/ethernet/smsc/smsc9420.c b/drivers/net/ethernet/smsc/smsc9420.c
index ecfb43614d7b..d457fa2d7509 100644
--- a/drivers/net/ethernet/smsc/smsc9420.c
+++ b/drivers/net/ethernet/smsc/smsc9420.c
@@ -1250,12 +1250,11 @@ static int smsc9420_alloc_tx_ring(struct smsc9420_pdata *pd)
1250 1250
1251 BUG_ON(!pd->tx_ring); 1251 BUG_ON(!pd->tx_ring);
1252 1252
1253 pd->tx_buffers = kmalloc((sizeof(struct smsc9420_ring_info) * 1253 pd->tx_buffers = kmalloc_array(TX_RING_SIZE,
1254 TX_RING_SIZE), GFP_KERNEL); 1254 sizeof(struct smsc9420_ring_info),
1255 if (!pd->tx_buffers) { 1255 GFP_KERNEL);
1256 smsc_warn(IFUP, "Failed to allocated tx_buffers"); 1256 if (!pd->tx_buffers)
1257 return -ENOMEM; 1257 return -ENOMEM;
1258 }
1259 1258
1260 /* Initialize the TX Ring */ 1259 /* Initialize the TX Ring */
1261 for (i = 0; i < TX_RING_SIZE; i++) { 1260 for (i = 0; i < TX_RING_SIZE; i++) {