| From b0e07321a3a1366c46289823cf9da9662489aa5f 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_cmt: 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 b262bc74dcfd77355720342cbcf89cc8ec12e86b) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/clocksource/sh_cmt.c | 6 +----- |
| 1 file changed, 1 insertion(+), 5 deletions(-) |
| |
| diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c |
| index 6b65621a9733..0779bf194aea 100644 |
| --- a/drivers/clocksource/sh_cmt.c |
| +++ b/drivers/clocksource/sh_cmt.c |
| @@ -672,8 +672,6 @@ static void sh_cmt_register_clockevent(struct sh_cmt_channel *ch, |
| { |
| struct clock_event_device *ced = &ch->ced; |
| |
| - memset(ced, 0, sizeof(*ced)); |
| - |
| ced->name = name; |
| ced->features = CLOCK_EVT_FEAT_PERIODIC; |
| ced->features |= CLOCK_EVT_FEAT_ONESHOT; |
| @@ -709,7 +707,6 @@ static int sh_cmt_setup_channel(struct sh_cmt_channel *ch, unsigned int index, |
| int irq; |
| int ret; |
| |
| - memset(ch, 0, sizeof(*ch)); |
| ch->cmt = cmt; |
| ch->base = cmt->mapbase_ch; |
| ch->index = index; |
| @@ -758,7 +755,6 @@ static int sh_cmt_setup(struct sh_cmt_device *cmt, struct platform_device *pdev) |
| int ret; |
| ret = -ENXIO; |
| |
| - memset(cmt, 0, sizeof(*cmt)); |
| cmt->pdev = pdev; |
| |
| if (!cfg) { |
| @@ -861,7 +857,7 @@ static int sh_cmt_probe(struct platform_device *pdev) |
| goto out; |
| } |
| |
| - cmt = kmalloc(sizeof(*cmt), GFP_KERNEL); |
| + cmt = kzalloc(sizeof(*cmt), GFP_KERNEL); |
| if (cmt == NULL) { |
| dev_err(&pdev->dev, "failed to allocate driver data\n"); |
| return -ENOMEM; |
| -- |
| 2.1.2 |
| |
