| From bbaba8a8d2033e610d83f227e708d48732e1e93d Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Tue, 4 Mar 2014 14:10:55 +0100 |
| Subject: clocksource: sh_mtu2: Replace kmalloc + memset with kzalloc |
| |
| One kzalloc a day keeps the bugs away. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Tested-by: Wolfram Sang <wsa@sang-engineering.com> |
| (cherry picked from commit 810c651369b343618d949826e0acd0df1b8b06eb) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/clocksource/sh_mtu2.c | 6 +----- |
| 1 file changed, 1 insertion(+), 5 deletions(-) |
| |
| diff --git a/drivers/clocksource/sh_mtu2.c b/drivers/clocksource/sh_mtu2.c |
| index 61827c66f7d3..94a53428a556 100644 |
| --- a/drivers/clocksource/sh_mtu2.c |
| +++ b/drivers/clocksource/sh_mtu2.c |
| @@ -241,8 +241,6 @@ static void sh_mtu2_register_clockevent(struct sh_mtu2_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->rating = rating; |
| @@ -279,7 +277,6 @@ static int sh_mtu2_setup_channel(struct sh_mtu2_channel *ch, |
| { |
| struct sh_timer_config *cfg = mtu->pdev->dev.platform_data; |
| |
| - memset(ch, 0, sizeof(*ch)); |
| ch->mtu = mtu; |
| ch->index = cfg->timer_bit; |
| |
| @@ -302,7 +299,6 @@ static int sh_mtu2_setup(struct sh_mtu2_device *mtu, |
| int ret; |
| ret = -ENXIO; |
| |
| - memset(mtu, 0, sizeof(*mtu)); |
| mtu->pdev = pdev; |
| |
| if (!cfg) { |
| @@ -373,7 +369,7 @@ static int sh_mtu2_probe(struct platform_device *pdev) |
| goto out; |
| } |
| |
| - mtu = kmalloc(sizeof(*mtu), GFP_KERNEL); |
| + mtu = kzalloc(sizeof(*mtu), GFP_KERNEL); |
| if (mtu == NULL) { |
| dev_err(&pdev->dev, "failed to allocate driver data\n"); |
| return -ENOMEM; |
| -- |
| 2.1.2 |
| |