2017-08-24 14:34:12

by Alexandre Belloni

[permalink] [raw]
Subject: [PATCH] m68knommu: remove dead code

As CONFIG_RTC_DRV_M5441x doesn't exist because the driver never made it
upstream, there is no device to register. Remove code that is never
compiled and init_BSP() as it doesn't do anything.

Signed-off-by: Alexandre Belloni <[email protected]>
---
arch/m68k/coldfire/m5441x.c | 37 -------------------------------------
1 file changed, 37 deletions(-)

diff --git a/arch/m68k/coldfire/m5441x.c b/arch/m68k/coldfire/m5441x.c
index dc589b039b62..04fd7fde9fb3 100644
--- a/arch/m68k/coldfire/m5441x.c
+++ b/arch/m68k/coldfire/m5441x.c
@@ -222,40 +222,3 @@ void __init config_BSP(char *commandp, int size)
m5441x_uarts_init();
m5441x_fec_init();
}
-
-
-#if IS_ENABLED(CONFIG_RTC_DRV_M5441x)
-static struct resource m5441x_rtc_resources[] = {
- {
- .start = MCFRTC_BASE,
- .end = MCFRTC_BASE + MCFRTC_SIZE - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = MCF_IRQ_RTC,
- .end = MCF_IRQ_RTC,
- .flags = IORESOURCE_IRQ,
- },
-};
-
-static struct platform_device m5441x_rtc = {
- .name = "mcfrtc",
- .id = 0,
- .resource = m5441x_rtc_resources,
- .num_resources = ARRAY_SIZE(m5441x_rtc_resources),
-};
-#endif
-
-static struct platform_device *m5441x_devices[] __initdata = {
-#if IS_ENABLED(CONFIG_RTC_DRV_M5441x)
- &m5441x_rtc,
-#endif
-};
-
-static int __init init_BSP(void)
-{
- platform_add_devices(m5441x_devices, ARRAY_SIZE(m5441x_devices));
- return 0;
-}
-
-arch_initcall(init_BSP);
--
2.14.1


2017-08-25 01:33:53

by Greg Ungerer

[permalink] [raw]
Subject: Re: [PATCH] m68knommu: remove dead code

Hi Alexandre,

On 25/08/17 00:34, Alexandre Belloni wrote:
> As CONFIG_RTC_DRV_M5441x doesn't exist because the driver never made it
> upstream, there is no device to register. Remove code that is never
> compiled and init_BSP() as it doesn't do anything.
>
> Signed-off-by: Alexandre Belloni <[email protected]>

Looks good, thanks. I have applied to m68knommu git tree, for-next branch.

Regards
Greg



> ---
> arch/m68k/coldfire/m5441x.c | 37 -------------------------------------
> 1 file changed, 37 deletions(-)
>
> diff --git a/arch/m68k/coldfire/m5441x.c b/arch/m68k/coldfire/m5441x.c
> index dc589b039b62..04fd7fde9fb3 100644
> --- a/arch/m68k/coldfire/m5441x.c
> +++ b/arch/m68k/coldfire/m5441x.c
> @@ -222,40 +222,3 @@ void __init config_BSP(char *commandp, int size)
> m5441x_uarts_init();
> m5441x_fec_init();
> }
> -
> -
> -#if IS_ENABLED(CONFIG_RTC_DRV_M5441x)
> -static struct resource m5441x_rtc_resources[] = {
> - {
> - .start = MCFRTC_BASE,
> - .end = MCFRTC_BASE + MCFRTC_SIZE - 1,
> - .flags = IORESOURCE_MEM,
> - },
> - {
> - .start = MCF_IRQ_RTC,
> - .end = MCF_IRQ_RTC,
> - .flags = IORESOURCE_IRQ,
> - },
> -};
> -
> -static struct platform_device m5441x_rtc = {
> - .name = "mcfrtc",
> - .id = 0,
> - .resource = m5441x_rtc_resources,
> - .num_resources = ARRAY_SIZE(m5441x_rtc_resources),
> -};
> -#endif
> -
> -static struct platform_device *m5441x_devices[] __initdata = {
> -#if IS_ENABLED(CONFIG_RTC_DRV_M5441x)
> - &m5441x_rtc,
> -#endif
> -};
> -
> -static int __init init_BSP(void)
> -{
> - platform_add_devices(m5441x_devices, ARRAY_SIZE(m5441x_devices));
> - return 0;
> -}
> -
> -arch_initcall(init_BSP);
>

2017-08-27 11:28:54

by Angelo Dureghello

[permalink] [raw]
Subject: Re: [PATCH] m68knommu: remove dead code

Hi,

just to inform you that i have in mind to add spi(soon, at least seems
just a matter con Kconfig changes) and usdhc(later)
drivers/support for stmark2 mcf5441x based board.
But no problem, in case i'll re-add the this code as needed.

On 24/08/2017 16:34, Alexandre Belloni wrote:
> As CONFIG_RTC_DRV_M5441x doesn't exist because the driver never made it
> upstream, there is no device to register. Remove code that is never
> compiled and init_BSP() as it doesn't do anything.
>
> Signed-off-by: Alexandre Belloni <[email protected]>
> ---
> arch/m68k/coldfire/m5441x.c | 37 -------------------------------------
> 1 file changed, 37 deletions(-)
>
> diff --git a/arch/m68k/coldfire/m5441x.c b/arch/m68k/coldfire/m5441x.c
> index dc589b039b62..04fd7fde9fb3 100644
> --- a/arch/m68k/coldfire/m5441x.c
> +++ b/arch/m68k/coldfire/m5441x.c
> @@ -222,40 +222,3 @@ void __init config_BSP(char *commandp, int size)
> m5441x_uarts_init();
> m5441x_fec_init();
> }
> -
> -
> -#if IS_ENABLED(CONFIG_RTC_DRV_M5441x)
> -static struct resource m5441x_rtc_resources[] = {
> - {
> - .start = MCFRTC_BASE,
> - .end = MCFRTC_BASE + MCFRTC_SIZE - 1,
> - .flags = IORESOURCE_MEM,
> - },
> - {
> - .start = MCF_IRQ_RTC,
> - .end = MCF_IRQ_RTC,
> - .flags = IORESOURCE_IRQ,
> - },
> -};
> -
> -static struct platform_device m5441x_rtc = {
> - .name = "mcfrtc",
> - .id = 0,
> - .resource = m5441x_rtc_resources,
> - .num_resources = ARRAY_SIZE(m5441x_rtc_resources),
> -};
> -#endif
> -
> -static struct platform_device *m5441x_devices[] __initdata = {
> -#if IS_ENABLED(CONFIG_RTC_DRV_M5441x)
> - &m5441x_rtc,
> -#endif
> -};
> -
> -static int __init init_BSP(void)
> -{
> - platform_add_devices(m5441x_devices, ARRAY_SIZE(m5441x_devices));
> - return 0;
> -}
> -
> -arch_initcall(init_BSP);
>

Regards,
Angelo

2017-08-27 19:10:03

by Alexandre Belloni

[permalink] [raw]
Subject: Re: [PATCH] m68knommu: remove dead code

On 27/08/2017 at 13:22:09 +0200, Angelo Dureghello wrote:
> Hi,
>
> just to inform you that i have in mind to add spi(soon, at least seems
> just a matter con Kconfig changes) and usdhc(later)
> drivers/support for stmark2 mcf5441x based board.
> But no problem, in case i'll re-add the this code as needed.
>

I think it is easy enough to reintroduce init_BSP with your patch. It is
unfortunate that this useless function stayed that way so long, waiting
for a real user :)

> On 24/08/2017 16:34, Alexandre Belloni wrote:
> > As CONFIG_RTC_DRV_M5441x doesn't exist because the driver never made it
> > upstream, there is no device to register. Remove code that is never
> > compiled and init_BSP() as it doesn't do anything.
> >
> > Signed-off-by: Alexandre Belloni <[email protected]>
> > ---
> > arch/m68k/coldfire/m5441x.c | 37 -------------------------------------
> > 1 file changed, 37 deletions(-)
> >
> > diff --git a/arch/m68k/coldfire/m5441x.c b/arch/m68k/coldfire/m5441x.c
> > index dc589b039b62..04fd7fde9fb3 100644
> > --- a/arch/m68k/coldfire/m5441x.c
> > +++ b/arch/m68k/coldfire/m5441x.c
> > @@ -222,40 +222,3 @@ void __init config_BSP(char *commandp, int size)
> > m5441x_uarts_init();
> > m5441x_fec_init();
> > }
> > -
> > -
> > -#if IS_ENABLED(CONFIG_RTC_DRV_M5441x)
> > -static struct resource m5441x_rtc_resources[] = {
> > - {
> > - .start = MCFRTC_BASE,
> > - .end = MCFRTC_BASE + MCFRTC_SIZE - 1,
> > - .flags = IORESOURCE_MEM,
> > - },
> > - {
> > - .start = MCF_IRQ_RTC,
> > - .end = MCF_IRQ_RTC,
> > - .flags = IORESOURCE_IRQ,
> > - },
> > -};
> > -
> > -static struct platform_device m5441x_rtc = {
> > - .name = "mcfrtc",
> > - .id = 0,
> > - .resource = m5441x_rtc_resources,
> > - .num_resources = ARRAY_SIZE(m5441x_rtc_resources),
> > -};
> > -#endif
> > -
> > -static struct platform_device *m5441x_devices[] __initdata = {
> > -#if IS_ENABLED(CONFIG_RTC_DRV_M5441x)
> > - &m5441x_rtc,
> > -#endif
> > -};
> > -
> > -static int __init init_BSP(void)
> > -{
> > - platform_add_devices(m5441x_devices, ARRAY_SIZE(m5441x_devices));
> > - return 0;
> > -}
> > -
> > -arch_initcall(init_BSP);
> >
>
> Regards,
> Angelo

--
Alexandre Belloni, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

2017-08-27 19:58:28

by Steven King

[permalink] [raw]
Subject: Re: [PATCH] m68knommu: remove dead code

On Sunday 27 August 2017 12:09:59 pm Alexandre Belloni wrote:
> On 27/08/2017 at 13:22:09 +0200, Angelo Dureghello wrote:
> > Hi,
> >
> > just to inform you that i have in mind to add spi(soon, at least seems
> > just a matter con Kconfig changes) and usdhc(later)
> > drivers/support for stmark2 mcf5441x based board.
> > But no problem, in case i'll re-add the this code as needed.
>
> I think it is easy enough to reintroduce init_BSP with your patch. It is
> unfortunate that this useless function stayed that way so long, waiting
> for a real user :)

I believe I was the original author, I dont remember why the code wasn't
merged. I still have the branch, if some wants to take it over and see it
gets merged I wouldn't have any objections ;-)

2017-08-27 21:11:52

by Alexandre Belloni

[permalink] [raw]
Subject: Re: [PATCH] m68knommu: remove dead code

On 27/08/2017 at 12:36:31 -0700, Steven King wrote:
> On Sunday 27 August 2017 12:09:59 pm Alexandre Belloni wrote:
> > On 27/08/2017 at 13:22:09 +0200, Angelo Dureghello wrote:
> > > Hi,
> > >
> > > just to inform you that i have in mind to add spi(soon, at least seems
> > > just a matter con Kconfig changes) and usdhc(later)
> > > drivers/support for stmark2 mcf5441x based board.
> > > But no problem, in case i'll re-add the this code as needed.
> >
> > I think it is easy enough to reintroduce init_BSP with your patch. It is
> > unfortunate that this useless function stayed that way so long, waiting
> > for a real user :)
>
> I believe I was the original author, I dont remember why the code wasn't
> merged. I still have the branch, if some wants to take it over and see it
> gets merged I wouldn't have any objections ;-)

There were comments from Geert that were not addressed:
http://patchwork.ozlabs.org/patch/165328/

--
Alexandre Belloni, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com