| Message ID | 20200108194520.3341-1-krzk@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | sh: sh4a: Remove unused tmu3_device | expand |
Hi Krzysztof, On Wed, Jan 8, 2020 at 8:45 PM Krzysztof Kozlowski <krzk@kernel.org> wrote: > Remove left-over from previous cleanups to silence the warning: > > arch/sh/kernel/cpu/sh4a/setup-sh7786.c:243:31: > warning: ‘tmu3_device’ defined but not used [-Wunused-variable] > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > --- > arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 21 --------------------- > 1 file changed, 21 deletions(-) > > diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c > index 4b0db8259e3d..22d1c38f742f 100644 > --- a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c > +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c > @@ -229,27 +229,6 @@ static struct platform_device tmu2_device = { > .num_resources = ARRAY_SIZE(tmu2_resources), > }; > > -static struct sh_timer_config tmu3_platform_data = { > - .channels_mask = 7, > -}; > - > -static struct resource tmu3_resources[] = { > - DEFINE_RES_MEM(0xffde0000, 0x2c), > - DEFINE_RES_IRQ(evt2irq(0x7c0)), > - DEFINE_RES_IRQ(evt2irq(0x7c0)), > - DEFINE_RES_IRQ(evt2irq(0x7c0)), > -}; > - > -static struct platform_device tmu3_device = { > - .name = "sh-tmu", > - .id = 3, > - .dev = { > - .platform_data = &tmu3_platform_data, > - }, > - .resource = tmu3_resources, > - .num_resources = ARRAY_SIZE(tmu3_resources), > -}; > - > static const struct sh_dmae_channel dmac0_channels[] = { > { > .offset = 0, Looks like the previous cleanup accidentally removed one too many tmu device pointers. The old style used one device per timer, the new style uses one device per 3 timers, i.e. 4 devices for 12 timers. So the correct fix would be to re-add "&tmu3_device" to sh7786_early_devices[]. Fixes: 1399c195ef5009bf ("sh: Switch to new style TMU device") Gr{oetje,eeting}s, Geert
On Thu, Jan 09, 2020 at 01:56:58PM +0100, Geert Uytterhoeven wrote: > Hi Krzysztof, > > On Wed, Jan 8, 2020 at 8:45 PM Krzysztof Kozlowski <krzk@kernel.org> wrote: > > Remove left-over from previous cleanups to silence the warning: > > > > arch/sh/kernel/cpu/sh4a/setup-sh7786.c:243:31: > > warning: ‘tmu3_device’ defined but not used [-Wunused-variable] > > > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > > --- > > arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 21 --------------------- > > 1 file changed, 21 deletions(-) > > > > diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c > > index 4b0db8259e3d..22d1c38f742f 100644 > > --- a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c > > +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c > > @@ -229,27 +229,6 @@ static struct platform_device tmu2_device = { > > .num_resources = ARRAY_SIZE(tmu2_resources), > > }; > > > > -static struct sh_timer_config tmu3_platform_data = { > > - .channels_mask = 7, > > -}; > > - > > -static struct resource tmu3_resources[] = { > > - DEFINE_RES_MEM(0xffde0000, 0x2c), > > - DEFINE_RES_IRQ(evt2irq(0x7c0)), > > - DEFINE_RES_IRQ(evt2irq(0x7c0)), > > - DEFINE_RES_IRQ(evt2irq(0x7c0)), > > -}; > > - > > -static struct platform_device tmu3_device = { > > - .name = "sh-tmu", > > - .id = 3, > > - .dev = { > > - .platform_data = &tmu3_platform_data, > > - }, > > - .resource = tmu3_resources, > > - .num_resources = ARRAY_SIZE(tmu3_resources), > > -}; > > - > > static const struct sh_dmae_channel dmac0_channels[] = { > > { > > .offset = 0, > > Looks like the previous cleanup accidentally removed one too many tmu > device pointers. The old style used one device per timer, the new style > uses one device per 3 timers, i.e. 4 devices for 12 timers. > > So the correct fix would be to re-add "&tmu3_device" to > sh7786_early_devices[]. > > Fixes: 1399c195ef5009bf ("sh: Switch to new style TMU device") Indeed, thanks. I'll send v2. Best regards, Krzysztof
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c index 4b0db8259e3d..22d1c38f742f 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c @@ -229,27 +229,6 @@ static struct platform_device tmu2_device = { .num_resources = ARRAY_SIZE(tmu2_resources), }; -static struct sh_timer_config tmu3_platform_data = { - .channels_mask = 7, -}; - -static struct resource tmu3_resources[] = { - DEFINE_RES_MEM(0xffde0000, 0x2c), - DEFINE_RES_IRQ(evt2irq(0x7c0)), - DEFINE_RES_IRQ(evt2irq(0x7c0)), - DEFINE_RES_IRQ(evt2irq(0x7c0)), -}; - -static struct platform_device tmu3_device = { - .name = "sh-tmu", - .id = 3, - .dev = { - .platform_data = &tmu3_platform_data, - }, - .resource = tmu3_resources, - .num_resources = ARRAY_SIZE(tmu3_resources), -}; - static const struct sh_dmae_channel dmac0_channels[] = { { .offset = 0,
Remove left-over from previous cleanups to silence the warning: arch/sh/kernel/cpu/sh4a/setup-sh7786.c:243:31: warning: ‘tmu3_device’ defined but not used [-Wunused-variable] Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> --- arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 21 --------------------- 1 file changed, 21 deletions(-)