aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorThomas Meyer <thomas@m3y3r.de>2011-11-17 07:43:40 -0500
committerDavid S. Miller <davem@davemloft.net>2011-11-21 15:02:36 -0500
commitcb508701efa01ba8628ff2d4280dbbb713d62955 (patch)
tree44cb25e132bab2aa5d41b4037e6377bedd0fde1c /drivers
parent7a2da3d45cc6f623bbb83a813478b10dbcb45968 (diff)
ksz884x: Use kzalloc rather than kmalloc followed by memset with 0
This considers some simple cases that are common and easy to validate Note in particular that there are no ...s in the rule, so all of the matched code has to be contiguous The semantic patch that makes this change is available in scripts/coccinelle/api/alloc/kzalloc-simple.cocci. Signed-off-by: Thomas Meyer <thomas@m3y3r.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/micrel/ksz884x.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c
index 7abd510fe01f..a718865a8fed 100644
--- a/drivers/net/ethernet/micrel/ksz884x.c
+++ b/drivers/net/ethernet/micrel/ksz884x.c
@@ -4380,12 +4380,10 @@ static void ksz_update_timer(struct ksz_timer_info *info)
4380 */ 4380 */
4381static int ksz_alloc_soft_desc(struct ksz_desc_info *desc_info, int transmit) 4381static int ksz_alloc_soft_desc(struct ksz_desc_info *desc_info, int transmit)
4382{ 4382{
4383 desc_info->ring = kmalloc(sizeof(struct ksz_desc) * desc_info->alloc, 4383 desc_info->ring = kzalloc(sizeof(struct ksz_desc) * desc_info->alloc,
4384 GFP_KERNEL); 4384 GFP_KERNEL);
4385 if (!desc_info->ring) 4385 if (!desc_info->ring)
4386 return 1; 4386 return 1;
4387 memset((void *) desc_info->ring, 0,
4388 sizeof(struct ksz_desc) * desc_info->alloc);
4389 hw_init_desc(desc_info, transmit); 4387 hw_init_desc(desc_info, transmit);
4390 return 0; 4388 return 0;
4391} 4389}