[PATCH] m68k: Remove references to obsolete CONFIG_SERIAL167

[PATCH] m68k: Remove references to obsolete CONFIG_SERIAL167

[Geert Uytterhoeven]

commit 51c9d654c2def97827395a7fbfd0c6f865c26544 ("Staging: delete tty
drivers") removed the MVME167 serial driver, but forgot to remove these
references.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 arch/m68k/Kconfig.devices           |    2 +-
 arch/m68k/configs/multi_defconfig   |    1 -
 arch/m68k/configs/mvme16x_defconfig |    1 -
 3 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/arch/m68k/Kconfig.devices b/arch/m68k/Kconfig.devices
index 6033f5d..e01eeb2 100644
--- a/arch/m68k/Kconfig.devices
+++ b/arch/m68k/Kconfig.devices
@@ -128,7 +128,7 @@ config DN_SERIAL
 
 config SERIAL_CONSOLE
 	bool "Support for serial port console"
-	depends on (AMIGA || ATARI || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_MIDI=y || AMIGA_BUILTIN_SERIAL=y || MULTIFACE_III_TTY=y || SERIAL=y || SERIAL167 || DN_SERIAL)
+	depends on (AMIGA || ATARI || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_MIDI=y || AMIGA_BUILTIN_SERIAL=y || MULTIFACE_III_TTY=y || SERIAL=y || DN_SERIAL)
 	---help---
 	  If you say Y here, it will be possible to use a serial port as the
 	  system console (the system console is the device which receives all
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig
index 88fb437..116e2ec 100644
--- a/arch/m68k/configs/multi_defconfig
+++ b/arch/m68k/configs/multi_defconfig
@@ -330,7 +330,6 @@ CONFIG_ATARI_MIDI=y
 CONFIG_ATARI_DSP56K=m
 CONFIG_AMIGA_BUILTIN_SERIAL=y
 CONFIG_MULTIFACE_III_TTY=m
-CONFIG_SERIAL167=y
 CONFIG_DN_SERIAL=y
 CONFIG_SERIAL_CONSOLE=y
 CONFIG_EXT2_FS=y
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig
index c45aaf3..6dd12e6 100644
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_defconfig
@@ -218,7 +218,6 @@ CONFIG_GEN_RTC_X=y
 CONFIG_HID=m
 CONFIG_HIDRAW=y
 # CONFIG_USB_SUPPORT is not set
-CONFIG_SERIAL167=y
 CONFIG_SERIAL_CONSOLE=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
-- 
1.7.0.4

Re: [PATCH] m68k: Remove references to obsolete CONFIG_SERIAL167

[Paul Bolle]

On Sun, 2011-11-13 at 11:31 +0100, Geert Uytterhoeven wrote:
> commit 51c9d654c2def97827395a7fbfd0c6f865c26544 ("Staging: delete tty
> drivers") removed the MVME167 serial driver, but forgot to remove these
> references.
> 
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> ---
>  arch/m68k/Kconfig.devices           |    2 +-
>  arch/m68k/configs/multi_defconfig   |    1 -
>  arch/m68k/configs/mvme16x_defconfig |    1 -
>  3 files changed, 1 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/m68k/Kconfig.devices b/arch/m68k/Kconfig.devices
> index 6033f5d..e01eeb2 100644
> --- a/arch/m68k/Kconfig.devices
> +++ b/arch/m68k/Kconfig.devices
> @@ -128,7 +128,7 @@ config DN_SERIAL
>  
>  config SERIAL_CONSOLE
>  	bool "Support for serial port console"
> -	depends on (AMIGA || ATARI || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_MIDI=y || AMIGA_BUILTIN_SERIAL=y || MULTIFACE_III_TTY=y || SERIAL=y || SERIAL167 || DN_SERIAL)
> +	depends on (AMIGA || ATARI || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_MIDI=y || AMIGA_BUILTIN_SERIAL=y || MULTIFACE_III_TTY=y || SERIAL=y || DN_SERIAL)

0) The SERIAL=y part can also be dropped. There's no Kconfig symbol
SERIAL.

1) I've been looking at this impressive dependency list a few days back.
My impression was that it can be reduced to only AMIGA_BUILTIN_SERIAL=y.
(After that this Kconfig symbol might better be renamed to
AMIGA_BUILTIN_SERIAL_CONSOLE.)

I might have a draft patch to drop the dependencies somewhere. I need to
have another look at that (draft) patch before I can submit it.

>  	---help---
>  	  If you say Y here, it will be possible to use a serial port as the
>  	  system console (the system console is the device which receives all


Paul Bolle

Re: [PATCH] m68k: Remove references to obsolete CONFIG_SERIAL167

[Geert Uytterhoeven]

On Sun, Nov 13, 2011 at 12:02, Paul Bolle <pebolle@tiscali.nl> wrote:
> On Sun, 2011-11-13 at 11:31 +0100, Geert Uytterhoeven wrote:
>> commit 51c9d654c2def97827395a7fbfd0c6f865c26544 ("Staging: delete tty
>> drivers") removed the MVME167 serial driver, but forgot to remove these
>> references.
>>
>> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
>> ---
>>  arch/m68k/Kconfig.devices           |    2 +-
>>  arch/m68k/configs/multi_defconfig   |    1 -
>>  arch/m68k/configs/mvme16x_defconfig |    1 -
>>  3 files changed, 1 insertions(+), 3 deletions(-)
>>
>> diff --git a/arch/m68k/Kconfig.devices b/arch/m68k/Kconfig.devices
>> index 6033f5d..e01eeb2 100644
>> --- a/arch/m68k/Kconfig.devices
>> +++ b/arch/m68k/Kconfig.devices
>> @@ -128,7 +128,7 @@ config DN_SERIAL
>>
>>  config SERIAL_CONSOLE
>>       bool "Support for serial port console"
>> -     depends on (AMIGA || ATARI || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_MIDI=y || AMIGA_BUILTIN_SERIAL=y || MULTIFACE_III_TTY=y || SERIAL=y || SERIAL167 || DN_SERIAL)
>> +     depends on (AMIGA || ATARI || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_MIDI=y || AMIGA_BUILTIN_SERIAL=y || MULTIFACE_III_TTY=y || SERIAL=y || DN_SERIAL)
>
> 0) The SERIAL=y part can also be dropped. There's no Kconfig symbol
> SERIAL.

OK, will do.

> 1) I've been looking at this impressive dependency list a few days back.
> My impression was that it can be reduced to only AMIGA_BUILTIN_SERIAL=y.
> (After that this Kconfig symbol might better be renamed to
> AMIGA_BUILTIN_SERIAL_CONSOLE.)
>
> I might have a draft patch to drop the dependencies somewhere. I need to
> have another look at that (draft) patch before I can submit it.

You are right: all drivers (except for AMIGA_BUILTIN_SERIAL) got lost due to
bitrot, or never made it to mainline. Will fix.

But please keep SERIAL_CONSOLE.

BTW, updating the m68k defconfigs is also on my list.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH] m68k: Remove references to obsolete CONFIG_SERIAL167

[Paul Bolle]

On Thu, 2011-11-17 at 20:33 +0100, Geert Uytterhoeven wrote:
> On Sun, Nov 13, 2011 at 12:02, Paul Bolle <pebolle@tiscali.nl> wrote:
> > 1) I've been looking at this impressive dependency list a few days back.
> > My impression was that it can be reduced to only AMIGA_BUILTIN_SERIAL=y.
> > (After that this Kconfig symbol might better be renamed to
> > AMIGA_BUILTIN_SERIAL_CONSOLE.)
> >
> > I might have a draft patch to drop the dependencies somewhere. I need to
> > have another look at that (draft) patch before I can submit it.
> 
> You are right: all drivers (except for AMIGA_BUILTIN_SERIAL) got lost due to
> bitrot, or never made it to mainline. Will fix.

Nice.

> But please keep SERIAL_CONSOLE.

Why do you care about SERIAL_CONSOLE? If it's only really used by
AMIGA_BUILTIN_SERIAL why shouldn't we rename it to
AMIGA_BUILTIN_SERIAL_CONSOLE?

> BTW, updating the m68k defconfigs is also on my list.

Nice too. Jiri Kosina already claimed to be able to handle any problems
caused by my cleaning efforts (which I haven't made public, since I'm
still pondering on a way to publish a 400K+ patch).


Paul Bolle

Re: [PATCH] m68k: Remove references to obsolete CONFIG_SERIAL167

[Geert Uytterhoeven]

On Thu, Nov 17, 2011 at 20:53, Paul Bolle <pebolle@tiscali.nl> wrote:
> > But please keep SERIAL_CONSOLE.
>
> Why do you care about SERIAL_CONSOLE? If it's only really used by
> AMIGA_BUILTIN_SERIAL why shouldn't we rename it to
> AMIGA_BUILTIN_SERIAL_CONSOLE?

Because SERIAL_CONSOLE is a universal platform-independent symbol.
Other arches have it as well (but less than in the past).

As soon as m68k gets a new serial driver, it will be used by 2 drivers again.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH] m68k: Remove references to obsolete CONFIG_SERIAL167

[Paul Bolle]

On Thu, 2011-11-17 at 22:05 +0100, Geert Uytterhoeven wrote:
> > Why do you care about SERIAL_CONSOLE? If it's only really used by
> > AMIGA_BUILTIN_SERIAL why shouldn't we rename it to
> > AMIGA_BUILTIN_SERIAL_CONSOLE?
> 
> Because SERIAL_CONSOLE is a universal platform-independent symbol.
> Other arches have it as well (but less than in the past).
> 
> As soon as m68k gets a new serial driver, it will be used by 2 drivers again.

If one does
    $ git grep -n  "\<\(CONFIG_\)\?SERIAL_CONSOLE\>" | grep -v defconfig

one gets a few hits (summarized):
- arch/m68k/Kconfig.devices: discussed here;
- arch/sparc/Kconfig: apparently unused, and can be dropped;
- arch/xtensa/Kconfig and arch/xtensa/platforms/iss/console.c: the only
  other current usage (note that the "S6105" platform, mentioned in the
  Kconfig file, seems not to use it);
- drivers/staging/serial/68360serial.c: uses CONFIG_SERIAL_CONSOLE, but
  I don't see how it can actually be set for that driver;
- drivers/tty/amiserial.c: discussed here.

I see nothing universal about it: two independent usages, one in
*/iss/console.c and one in */amiserial.c. So I'd say these can be
renamed to (say) ISS_SERIAL_CONSOLE and AMIGA_BUILTIN_SERIAL_CONSOLE.


Paul Bolle

Re: [PATCH] m68k: Remove references to obsolete CONFIG_SERIAL167

[Paul Bolle]

On Thu, 2011-11-17 at 22:34 +0100, Paul Bolle wrote:
> I see nothing universal about it: two independent usages, one in
> */iss/console.c and one in */amiserial.c. So I'd say these can be
> renamed to (say) ISS_SERIAL_CONSOLE and AMIGA_BUILTIN_SERIAL_CONSOLE.

And, looking at it again, in */iss/console.c it can just as well be
dropped, as SERIAL_CONSOLE will always be set for that platform. So the
only actual usage I see is in */amiserial.c.


Paul Bolle