Commit d116fe5a authored by Eric Sesterhenn's avatar Eric Sesterhenn Committed by Paul Mackerras

[PATCH] kzalloc() conversion in arch/ppc

This converts arch/ppc to kzalloc usage.
Crosscompile tested with allyesconfig.
Signed-off-by: default avatarEric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 0f6be7b7
...@@ -1637,9 +1637,8 @@ static struct SICC_info *siccuart_get(int line) ...@@ -1637,9 +1637,8 @@ static struct SICC_info *siccuart_get(int line)
state->count++; state->count++;
if (state->info) if (state->info)
return state->info; return state->info;
info = kmalloc(sizeof(struct SICC_info), GFP_KERNEL); info = kzalloc(sizeof(struct SICC_info), GFP_KERNEL);
if (info) { if (info) {
memset(info, 0, sizeof(struct SICC_info));
init_waitqueue_head(&info->open_wait); init_waitqueue_head(&info->open_wait);
init_waitqueue_head(&info->close_wait); init_waitqueue_head(&info->close_wait);
init_waitqueue_head(&info->delta_msr_wait); init_waitqueue_head(&info->delta_msr_wait);
......
...@@ -126,8 +126,7 @@ smp_generic_give_timebase( void ) ...@@ -126,8 +126,7 @@ smp_generic_give_timebase( void )
printk("Synchronizing timebase\n"); printk("Synchronizing timebase\n");
/* if this fails then this kernel won't work anyway... */ /* if this fails then this kernel won't work anyway... */
tbsync = kmalloc( sizeof(*tbsync), GFP_KERNEL ); tbsync = kzalloc( sizeof(*tbsync), GFP_KERNEL );
memset( tbsync, 0, sizeof(*tbsync) );
mb(); mb();
running = 1; running = 1;
......
...@@ -662,12 +662,11 @@ katana_setup_mtd(void) ...@@ -662,12 +662,11 @@ katana_setup_mtd(void)
ptbl_entries = (size >= (64*MB)) ? 6 : 4; ptbl_entries = (size >= (64*MB)) ? 6 : 4;
if ((ptbl = kmalloc(ptbl_entries * sizeof(struct mtd_partition), if ((ptbl = kcalloc(ptbl_entries, sizeof(struct mtd_partition),
GFP_KERNEL)) == NULL) { GFP_KERNEL)) == NULL) {
printk(KERN_WARNING "Can't alloc MTD partition table\n"); printk(KERN_WARNING "Can't alloc MTD partition table\n");
return -ENOMEM; return -ENOMEM;
} }
memset(ptbl, 0, ptbl_entries * sizeof(struct mtd_partition));
ptbl[0].name = "Monitor"; ptbl[0].name = "Monitor";
ptbl[0].size = KATANA_MTD_MONITOR_SIZE; ptbl[0].size = KATANA_MTD_MONITOR_SIZE;
......
...@@ -683,11 +683,10 @@ ppc7d_fixup_i2c_pdata(struct platform_device *pdev) ...@@ -683,11 +683,10 @@ ppc7d_fixup_i2c_pdata(struct platform_device *pdev)
pdata = pdev->dev.platform_data; pdata = pdev->dev.platform_data;
if (pdata == NULL) { if (pdata == NULL) {
pdata = kmalloc(sizeof(*pdata), GFP_KERNEL); pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
if (pdata == NULL) if (pdata == NULL)
return; return;
memset(pdata, 0, sizeof(*pdata));
pdev->dev.platform_data = pdata; pdev->dev.platform_data = pdata;
} }
......
...@@ -451,10 +451,9 @@ ocp_driver_init(void) ...@@ -451,10 +451,9 @@ ocp_driver_init(void)
DBG(("ocp: ocp_driver_init()...\n")); DBG(("ocp: ocp_driver_init()...\n"));
/* Allocate/register primary OCP bus */ /* Allocate/register primary OCP bus */
ocp_bus = kmalloc(sizeof(struct device), GFP_KERNEL); ocp_bus = kzalloc(sizeof(struct device), GFP_KERNEL);
if (ocp_bus == NULL) if (ocp_bus == NULL)
return 1; return 1;
memset(ocp_bus, 0, sizeof(struct device));
strcpy(ocp_bus->bus_id, "ocp"); strcpy(ocp_bus->bus_id, "ocp");
bus_register(&ocp_bus_type); bus_register(&ocp_bus_type);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment