| From 3898ef34de4f2a6a180b67994bbc4e0ed806e4ec Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Mon, 27 Jan 2014 22:04:17 +0100 |
| Subject: clocksource: sh_tmu: Replace kmalloc + memset with kzalloc |
| |
| One kzalloc a day keeps the bugs away. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| (cherry picked from commit 3b77a83eeabb885c5fff02756eba50f446a2d83c) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/clocksource/sh_tmu.c | 6 +----- |
| 1 file changed, 1 insertion(+), 5 deletions(-) |
| |
| diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c |
| index e30430439bb1..26a9f7dadfbc 100644 |
| --- a/drivers/clocksource/sh_tmu.c |
| +++ b/drivers/clocksource/sh_tmu.c |
| @@ -397,8 +397,6 @@ static void sh_tmu_register_clockevent(struct sh_tmu_channel *ch, |
| struct clock_event_device *ced = &ch->ced; |
| int ret; |
| |
| - memset(ced, 0, sizeof(*ced)); |
| - |
| ced->name = name; |
| ced->features = CLOCK_EVT_FEAT_PERIODIC; |
| ced->features |= CLOCK_EVT_FEAT_ONESHOT; |
| @@ -441,7 +439,6 @@ static int sh_tmu_channel_setup(struct sh_tmu_channel *ch, |
| { |
| struct sh_timer_config *cfg = tmu->pdev->dev.platform_data; |
| |
| - memset(ch, 0, sizeof(*ch)); |
| ch->tmu = tmu; |
| |
| /* |
| @@ -475,7 +472,6 @@ static int sh_tmu_setup(struct sh_tmu_device *tmu, struct platform_device *pdev) |
| int ret; |
| ret = -ENXIO; |
| |
| - memset(tmu, 0, sizeof(*tmu)); |
| tmu->pdev = pdev; |
| |
| if (!cfg) { |
| @@ -547,7 +543,7 @@ static int sh_tmu_probe(struct platform_device *pdev) |
| goto out; |
| } |
| |
| - tmu = kmalloc(sizeof(*tmu), GFP_KERNEL); |
| + tmu = kzalloc(sizeof(*tmu), GFP_KERNEL); |
| if (tmu == NULL) { |
| dev_err(&pdev->dev, "failed to allocate driver data\n"); |
| return -ENOMEM; |
| -- |
| 2.1.2 |
| |