diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-03-20 14:46:41 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-03-21 17:06:17 -0500 |
commit | d2a02b93cf78205dd23226efb66481569900976e (patch) | |
tree | 94760abdafe5cb72a41d3edd405a26d0c8e2e0d3 /arch/arm/common/scoop.c | |
parent | 18ec5c731271939acb414614e964c15c8ef52156 (diff) |
[ARM] Convert kmalloc+memset to kzalloc
Convert all uses of kmalloc followed by memset to use kzalloc instead.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/common/scoop.c')
-rw-r--r-- | arch/arm/common/scoop.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c index a2dfe0b0f1ec..5e830f444c6c 100644 --- a/arch/arm/common/scoop.c +++ b/arch/arm/common/scoop.c | |||
@@ -132,12 +132,10 @@ int __init scoop_probe(struct platform_device *pdev) | |||
132 | if (!mem) | 132 | if (!mem) |
133 | return -EINVAL; | 133 | return -EINVAL; |
134 | 134 | ||
135 | devptr = kmalloc(sizeof(struct scoop_dev), GFP_KERNEL); | 135 | devptr = kzalloc(sizeof(struct scoop_dev), GFP_KERNEL); |
136 | |||
137 | if (!devptr) | 136 | if (!devptr) |
138 | return -ENOMEM; | 137 | return -ENOMEM; |
139 | 138 | ||
140 | memset(devptr, 0, sizeof(struct scoop_dev)); | ||
141 | spin_lock_init(&devptr->scoop_lock); | 139 | spin_lock_init(&devptr->scoop_lock); |
142 | 140 | ||
143 | inf = pdev->dev.platform_data; | 141 | inf = pdev->dev.platform_data; |