Patchwork [PATCHv2,3/3] mpc52xx/wdt: remove obsolete old WDT implementation

login
register
mail settings
Submitter Albrecht Dreß
Date Nov. 12, 2009, 6:45 p.m.
Message ID <1258051520.2280.3@antares>
Download mbox | patch
Permalink /patch/38268/
State Superseded
Delegated to: Grant Likely
Headers show

Comments

Albrecht Dreß - Nov. 12, 2009, 6:45 p.m.
Remove the old WDT implementation.

Signed-off-by: Albrecht Dreß <albrecht.dress@arcor.de>
---

Change against v1: WDT stuff now fully merged into the file
arch/powerpc/platforms/52xx/mpc52xx_gpt.c.

Note: The file drivers/watchdog/mpc5200_wdt.c is now obsolete and should be removed.

 drivers/watchdog/Kconfig  |    4 +++-
 drivers/watchdog/Makefile |    1 -
 2 files changed, 3 insertions(+), 2 deletions(-)
Grant Likely - Nov. 12, 2009, 7:14 p.m.
On Thu, Nov 12, 2009 at 11:45 AM, Albrecht Dreß <albrecht.dress@arcor.de> wrote:
> Remove the old WDT implementation.
>
> Signed-off-by: Albrecht Dreß <albrecht.dress@arcor.de>

Acked-by: Grant Likely <grant.likely@secretlab.ca>

Wim, I'm picking up the other 2 patches into my tree.  Do you want me
to push this patch through my tree, or do you want to pick it up?

g.

> ---
>
> Change against v1: WDT stuff now fully merged into the file
> arch/powerpc/platforms/52xx/mpc52xx_gpt.c.
>
> Note: The file drivers/watchdog/mpc5200_wdt.c is now obsolete and should be removed.
>
>  drivers/watchdog/Kconfig  |    4 +++-
>  drivers/watchdog/Makefile |    1 -
>  2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 3711b88..d958b76 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -861,8 +861,10 @@ config GEF_WDT
>          Watchdog timer found in a number of GE Fanuc single board computers.
>
>  config MPC5200_WDT
> -       tristate "MPC5200 Watchdog Timer"
> +       bool "MPC52xx Watchdog Timer"
>        depends on PPC_MPC52xx
> +       help
> +         Use General Purpose Timer (GPT) 0 on the MPC5200 as Watchdog.
>
>  config 8xxx_WDT
>        tristate "MPC8xxx Platform Watchdog Timer"
> diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
> index 699199b..89c045d 100644
> --- a/drivers/watchdog/Makefile
> +++ b/drivers/watchdog/Makefile
> @@ -118,7 +118,6 @@ obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
>
>  # POWERPC Architecture
>  obj-$(CONFIG_GEF_WDT) += gef_wdt.o
> -obj-$(CONFIG_MPC5200_WDT) += mpc5200_wdt.o
>  obj-$(CONFIG_8xxx_WDT) += mpc8xxx_wdt.o
>  obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o
>  obj-$(CONFIG_PIKA_WDT) += pika_wdt.o
>
>
Wolfram Sang - Nov. 12, 2009, 7:56 p.m.
On Thu, Nov 12, 2009 at 07:45:20PM +0100, Albrecht Dreß wrote:
> Remove the old WDT implementation.
> 
> Signed-off-by: Albrecht Dreß <albrecht.dress@arcor.de>
> ---
> 
> Change against v1: WDT stuff now fully merged into the file
> arch/powerpc/platforms/52xx/mpc52xx_gpt.c.
> 
> Note: The file drivers/watchdog/mpc5200_wdt.c is now obsolete and should be removed.

Ehrm, this is possible within a patch :)

> 
>  drivers/watchdog/Kconfig  |    4 +++-
>  drivers/watchdog/Makefile |    1 -
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 3711b88..d958b76 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -861,8 +861,10 @@ config GEF_WDT
>  	  Watchdog timer found in a number of GE Fanuc single board computers.
>  
>  config MPC5200_WDT
> -	tristate "MPC5200 Watchdog Timer"
> +	bool "MPC52xx Watchdog Timer"
>  	depends on PPC_MPC52xx
> +	help
> +	  Use General Purpose Timer (GPT) 0 on the MPC5200 as Watchdog.

s/5200/52xx/ here too.

>  
>  config 8xxx_WDT
>  	tristate "MPC8xxx Platform Watchdog Timer"
> diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
> index 699199b..89c045d 100644
> --- a/drivers/watchdog/Makefile
> +++ b/drivers/watchdog/Makefile
> @@ -118,7 +118,6 @@ obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
>  
>  # POWERPC Architecture
>  obj-$(CONFIG_GEF_WDT) += gef_wdt.o
> -obj-$(CONFIG_MPC5200_WDT) += mpc5200_wdt.o
>  obj-$(CONFIG_8xxx_WDT) += mpc8xxx_wdt.o
>  obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o
>  obj-$(CONFIG_PIKA_WDT) += pika_wdt.o
> 
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/linuxppc-dev
Grant Likely - Nov. 12, 2009, 8:43 p.m.
On Thu, Nov 12, 2009 at 1:36 PM, Albrecht Dreß <albrecht.dress@arcor.de> wrote:
> Hi Wolfram:
>
> Am 12.11.09 20:56 schrieb(en) Wolfram Sang:
>>
>> > Note: The file drivers/watchdog/mpc5200_wdt.c is now obsolete and should
>> > be removed.
>>
>> Ehrm, this is possible within a patch :)
>
> Ummm, I tried that (removed the file from git locally), but apparently I'm
> too dumb to find the proper options to get this into the diff (to my
> defence, I'm still using cvs/svn for my projects).  Can you give me a hint?
>
>> >  config MPC5200_WDT
>> > -     tristate "MPC5200 Watchdog Timer"
>> > +     bool "MPC52xx Watchdog Timer"
>> >       depends on PPC_MPC52xx
>> > +     help
>> > +       Use General Purpose Timer (GPT) 0 on the MPC5200 as Watchdog.
>>
>> s/5200/52xx/ here too.
>
> Yes, you're right.  The config option should still be 'MPC5200_WDT', though,
> as otherwise all the default configs had to be touched - IMO, on the low
> level, this does no harm.  Thoughts?

I don't care.  Don't bother respinning just for this.

g.
Wolfram Sang - Nov. 12, 2009, 8:47 p.m.
On Thu, Nov 12, 2009 at 09:36:42PM +0100, Albrecht Dreß wrote:
> Hi Wolfram:
>
> Am 12.11.09 20:56 schrieb(en) Wolfram Sang:
>> > Note: The file drivers/watchdog/mpc5200_wdt.c is now obsolete and should
>> > be removed.
>>
>> Ehrm, this is possible within a patch :)
>
> Ummm, I tried that (removed the file from git locally), but apparently I'm
> too dumb to find the proper options to get this into the diff (to my defence,
> I'm still using cvs/svn for my projects).  Can you give me a hint?

git rm file

You can even do this after you removed the file using rm already. 'git status'
gives you an overview about the current changes and how to add them to the
commit.

> Yes, you're right.  The config option should still be 'MPC5200_WDT', though,
> as otherwise all the default configs had to be touched - IMO, on the low
> level, this does no harm.  Thoughts?

I'd also leave the config name. But the help text should match the prompt :)

Regards,

   Wolfram

Patch

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 3711b88..d958b76 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -861,8 +861,10 @@  config GEF_WDT
 	  Watchdog timer found in a number of GE Fanuc single board computers.
 
 config MPC5200_WDT
-	tristate "MPC5200 Watchdog Timer"
+	bool "MPC52xx Watchdog Timer"
 	depends on PPC_MPC52xx
+	help
+	  Use General Purpose Timer (GPT) 0 on the MPC5200 as Watchdog.
 
 config 8xxx_WDT
 	tristate "MPC8xxx Platform Watchdog Timer"
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 699199b..89c045d 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -118,7 +118,6 @@  obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
 
 # POWERPC Architecture
 obj-$(CONFIG_GEF_WDT) += gef_wdt.o
-obj-$(CONFIG_MPC5200_WDT) += mpc5200_wdt.o
 obj-$(CONFIG_8xxx_WDT) += mpc8xxx_wdt.o
 obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o
 obj-$(CONFIG_PIKA_WDT) += pika_wdt.o