Merge branch 'clockevents/cmt-mtu2-tmu-cleanups' into clockevents/3.16

diff --combined drivers/clocksource/sh_tmu.c
index a38022fa286f3289e4e760673b89ba212892efbe,ec340955e852e7f7af97434314bc231d7aae808c..6bd17a8f3dd417f5603e8ec52a2a4ca090d8d2e6
--- 1/drivers/clocksource/sh_tmu.c
--- 2/drivers/clocksource/sh_tmu.c
+++ b/drivers/clocksource/sh_tmu.c
@@@ -498,7 -498,7 +498,7 @@@ static int sh_tmu_channel_setup(struct 
                        ch->base = tmu->mapbase + 8 + ch->index * 12;
        }
  
-       ch->irq = platform_get_irq(tmu->pdev, ch->index);
+       ch->irq = platform_get_irq(tmu->pdev, index);
        if (ch->irq < 0) {
                dev_err(&tmu->pdev->dev, "ch%u: failed to get irq\n",
                        ch->index);
@@@ -644,8 -644,10 +644,8 @@@ static int sh_tmu_probe(struct platform
        }
  
        tmu = kzalloc(sizeof(*tmu), GFP_KERNEL);
 -      if (tmu == NULL) {
 -              dev_err(&pdev->dev, "failed to allocate driver data\n");
 +      if (tmu == NULL)
                return -ENOMEM;
 -      }
  
        ret = sh_tmu_setup(tmu, pdev);
        if (ret) {