[PATCH 12/21 v2] m68k: drop unused Kconfig symbols

[PATCH 12/21 v2] m68k: drop unused Kconfig symbols

[Paul Bolle]

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
0) Still only "git grep" tested.

1) New in v2:
- redone for linux-next master
- dropped a few "select EMAC_INC" and "select HW_FEITH" lines that
  weren't in current mainline
- dropped SOM5282EM too (discovered this while doing this second
  version, my scripts aren't smart enough too catch it)

 arch/m68k/Kconfig.devices |   28 +------------------------
 arch/m68k/Kconfig.machine |   50 ---------------------------------------------
 2 files changed, 1 insertions(+), 77 deletions(-)

diff --git a/arch/m68k/Kconfig.devices b/arch/m68k/Kconfig.devices
index d964dc4..dbff941 100644
--- a/arch/m68k/Kconfig.devices
+++ b/arch/m68k/Kconfig.devices
@@ -77,32 +77,6 @@ config MULTIFACE_III_TTY
 
 	  To compile this driver as a module, choose M here.
 
-config GVPIOEXT
-	tristate "GVP IO-Extender support"
-	depends on PARPORT=n && ZORRO
-	help
-	  If you want to use a GVP IO-Extender serial card in Linux, say Y.
-	  Otherwise, say N.
-
-config GVPIOEXT_LP
-	tristate "GVP IO-Extender parallel printer support"
-	depends on GVPIOEXT
-	help
-	  Say Y to enable driving a printer from the parallel port on your
-	  GVP IO-Extender card, N otherwise.
-
-config GVPIOEXT_PLIP
-	tristate "GVP IO-Extender PLIP support"
-	depends on GVPIOEXT
-	help
-	  Say Y to enable doing IP over the parallel port on your GVP
-	  IO-Extender card, N otherwise.
-
-config MAC_HID
-	bool
-	depends on INPUT_ADBHID
-	default y
-
 config HPDCA
 	tristate "HP DCA serial support"
 	depends on DIO && SERIAL_8250
@@ -145,7 +119,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 || GVPIOEXT=y || MULTIFACE_III_TTY=y || SERIAL=y || MVME147_SCC || SERIAL167 || MVME162_SCC || BVME6000_SCC || 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 || MVME147_SCC || SERIAL167 || MVME162_SCC || BVME6000_SCC || 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/Kconfig.machine b/arch/m68k/Kconfig.machine
index 7d5c20b..c19b514 100644
--- a/arch/m68k/Kconfig.machine
+++ b/arch/m68k/Kconfig.machine
@@ -303,16 +303,6 @@ config COBRA5282
 	help
 	  Support for the senTec COBRA5282 board.
 
-config EMAC_INC
-	bool
-
-config SOM5282EM
-	bool "EMAC.Inc SOM5282EM board support"
-	depends on M528x
-	select EMAC_INC
-	help
-	  Support for the EMAC.Inc SOM5282EM module.
-
 config WILDFIRE
 	bool "Intec Automation Inc. WildFire board support"
 	depends on M528x
@@ -371,27 +361,21 @@ config FIREBEE
 	help
 	  Support for the FireBee ColdFire 5475 based board.
 
-config HW_FEITH
-	bool
-
 config CLEOPATRA
 	bool "Feith CLEOPATRA board support"
 	depends on (M5307 || M5407)
-	select HW_FEITH
 	help
 	  Support for the Feith Cleopatra boards.
 
 config CANCam
 	bool "Feith CANCam board support"
 	depends on M5272
-	select HW_FEITH
 	help
 	  Support for the Feith CANCam board.
 
 config SCALES
 	bool "Feith SCALES board support"
 	depends on M5272
-	select HW_FEITH
 	help
 	  Support for the Feith SCALES board.
 
@@ -438,13 +422,6 @@ if !MMU || COLDFIRE
 
 comment "Machine Options"
 
-config ROMFS_FROM_ROM
-	bool "ROMFS image not RAM resident"
-	depends on (NETtel || SNAPGEAR)
-	help
-	  The ROMfs filesystem will stay resident in the FLASH/ROM, not be
-	  moved into RAM.
-
 config UBOOT
 	bool "Support for U-Boot command line parameters"
 	help
@@ -524,33 +501,6 @@ config KERNELBASE
 	  a system with the RAM based at address 0, and leaving enough room
 	  for the theoretical maximum number of 256 vectors.
 
-choice
-	prompt "RAM bus width"
-	default RAMAUTOBIT
-
-config RAMAUTOBIT
-	bool "AUTO"
-	help
-	  Select the physical RAM data bus size. Not needed on most platforms,
-	  so you can generally choose AUTO.
-
-config RAM8BIT
-	bool "8bit"
-	help
-	  Configure RAM bus to be 8 bits wide.
-
-config RAM16BIT
-	bool "16bit"
-	help
-	  Configure RAM bus to be 16 bits wide.
-
-config RAM32BIT
-	bool "32bit"
-	help
-	  Configure RAM bus to be 32 bits wide.
-
-endchoice
-
 comment "ROM configuration"
 
 config ROM
-- 
1.7.4.4

Re: [PATCH 12/21 v2] m68k: drop unused Kconfig symbols

[Greg Ungerer]

Hi Paul,

On 10/18/2011 06:10 PM, Paul Bolle wrote:
> Signed-off-by: Paul Bolle<pebolle@tiscali.nl>
> ---
> 0) Still only "git grep" tested.
>
> 1) New in v2:
> - redone for linux-next master
> - dropped a few "select EMAC_INC" and "select HW_FEITH" lines that
>    weren't in current mainline
> - dropped SOM5282EM too (discovered this while doing this second
>    version, my scripts aren't smart enough too catch it)

Hmm. I don't want to lose the SOM5282EM config option. Although it
isn't used inside the code it does let the configurer know that this
specific board is supported.

Regards
Greg


>   arch/m68k/Kconfig.devices |   28 +------------------------
>   arch/m68k/Kconfig.machine |   50 ---------------------------------------------
>   2 files changed, 1 insertions(+), 77 deletions(-)
>
> diff --git a/arch/m68k/Kconfig.devices b/arch/m68k/Kconfig.devices
> index d964dc4..dbff941 100644
> --- a/arch/m68k/Kconfig.devices
> +++ b/arch/m68k/Kconfig.devices
> @@ -77,32 +77,6 @@ config MULTIFACE_III_TTY
>
>   	  To compile this driver as a module, choose M here.
>
> -config GVPIOEXT
> -	tristate "GVP IO-Extender support"
> -	depends on PARPORT=n&&  ZORRO
> -	help
> -	  If you want to use a GVP IO-Extender serial card in Linux, say Y.
> -	  Otherwise, say N.
> -
> -config GVPIOEXT_LP
> -	tristate "GVP IO-Extender parallel printer support"
> -	depends on GVPIOEXT
> -	help
> -	  Say Y to enable driving a printer from the parallel port on your
> -	  GVP IO-Extender card, N otherwise.
> -
> -config GVPIOEXT_PLIP
> -	tristate "GVP IO-Extender PLIP support"
> -	depends on GVPIOEXT
> -	help
> -	  Say Y to enable doing IP over the parallel port on your GVP
> -	  IO-Extender card, N otherwise.
> -
> -config MAC_HID
> -	bool
> -	depends on INPUT_ADBHID
> -	default y
> -
>   config HPDCA
>   	tristate "HP DCA serial support"
>   	depends on DIO&&  SERIAL_8250
> @@ -145,7 +119,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 || GVPIOEXT=y || MULTIFACE_III_TTY=y || SERIAL=y || MVME147_SCC || SERIAL167 || MVME162_SCC || BVME6000_SCC || 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 || MVME147_SCC || SERIAL167 || MVME162_SCC || BVME6000_SCC || 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/Kconfig.machine b/arch/m68k/Kconfig.machine
> index 7d5c20b..c19b514 100644
> --- a/arch/m68k/Kconfig.machine
> +++ b/arch/m68k/Kconfig.machine
> @@ -303,16 +303,6 @@ config COBRA5282
>   	help
>   	  Support for the senTec COBRA5282 board.
>
> -config EMAC_INC
> -	bool
> -
> -config SOM5282EM
> -	bool "EMAC.Inc SOM5282EM board support"
> -	depends on M528x
> -	select EMAC_INC
> -	help
> -	  Support for the EMAC.Inc SOM5282EM module.
> -
>   config WILDFIRE
>   	bool "Intec Automation Inc. WildFire board support"
>   	depends on M528x
> @@ -371,27 +361,21 @@ config FIREBEE
>   	help
>   	  Support for the FireBee ColdFire 5475 based board.
>
> -config HW_FEITH
> -	bool
> -
>   config CLEOPATRA
>   	bool "Feith CLEOPATRA board support"
>   	depends on (M5307 || M5407)
> -	select HW_FEITH
>   	help
>   	  Support for the Feith Cleopatra boards.
>
>   config CANCam
>   	bool "Feith CANCam board support"
>   	depends on M5272
> -	select HW_FEITH
>   	help
>   	  Support for the Feith CANCam board.
>
>   config SCALES
>   	bool "Feith SCALES board support"
>   	depends on M5272
> -	select HW_FEITH
>   	help
>   	  Support for the Feith SCALES board.
>
> @@ -438,13 +422,6 @@ if !MMU || COLDFIRE
>
>   comment "Machine Options"
>
> -config ROMFS_FROM_ROM
> -	bool "ROMFS image not RAM resident"
> -	depends on (NETtel || SNAPGEAR)
> -	help
> -	  The ROMfs filesystem will stay resident in the FLASH/ROM, not be
> -	  moved into RAM.
> -
>   config UBOOT
>   	bool "Support for U-Boot command line parameters"
>   	help
> @@ -524,33 +501,6 @@ config KERNELBASE
>   	  a system with the RAM based at address 0, and leaving enough room
>   	  for the theoretical maximum number of 256 vectors.
>
> -choice
> -	prompt "RAM bus width"
> -	default RAMAUTOBIT
> -
> -config RAMAUTOBIT
> -	bool "AUTO"
> -	help
> -	  Select the physical RAM data bus size. Not needed on most platforms,
> -	  so you can generally choose AUTO.
> -
> -config RAM8BIT
> -	bool "8bit"
> -	help
> -	  Configure RAM bus to be 8 bits wide.
> -
> -config RAM16BIT
> -	bool "16bit"
> -	help
> -	  Configure RAM bus to be 16 bits wide.
> -
> -config RAM32BIT
> -	bool "32bit"
> -	help
> -	  Configure RAM bus to be 32 bits wide.
> -
> -endchoice
> -
>   comment "ROM configuration"
>
>   config ROM


-- 
------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     gerg@snapgear.com
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
8 Gardner Close,                            FAX:         +61 7 3891 3630
Milton, QLD, 4064, Australia                WEB: http://www.SnapGear.com

Re: [PATCH 12/21 v2] m68k: drop unused Kconfig symbols

[Paul Bolle]

On Tue, 2011-10-18 at 22:07 +1000, Greg Ungerer wrote:
> > - dropped SOM5282EM too (discovered this while doing this second
> >    version, my scripts aren't smart enough too catch it)
> 
> Hmm. I don't want to lose the SOM5282EM config option. Although it
> isn't used inside the code it does let the configurer know that this
> specific board is supported.

Isn't there another way? You're also adding a configuration option. This
means your configurer has to make a decision whether or not to enable
support for that board while this decision actually has no effect.
Apparently that support comes for free (I'm guessing once M528x support
is enabled, I haven't checked that). Wouldn't a comment do? Or adding a
line to some help text? 

In the mean time I suppose you're willing to fix this part of my patch
yourself (ie, I don't have to redo this again).


Paul Bolle

Re: [PATCH 12/21 v2] m68k: drop unused Kconfig symbols

[Greg Ungerer]

Hi Paul,

On 18/10/11 22:30, Paul Bolle wrote:
> On Tue, 2011-10-18 at 22:07 +1000, Greg Ungerer wrote:
>>> - dropped SOM5282EM too (discovered this while doing this second
>>>     version, my scripts aren't smart enough too catch it)
>>
>> Hmm. I don't want to lose the SOM5282EM config option. Although it
>> isn't used inside the code it does let the configurer know that this
>> specific board is supported.
>
> Isn't there another way? You're also adding a configuration option. This
> means your configurer has to make a decision whether or not to enable
> support for that board while this decision actually has no effect.

Yes, that is the idea. The configurer doesn't need to know it has
no effect (at least currently anyway). But they know that the board
is supported.


> Apparently that support comes for free (I'm guessing once M528x support
> is enabled, I haven't checked that). Wouldn't a comment do? Or adding a
> line to some help text?
>
> In the mean time I suppose you're willing to fix this part of my patch
> yourself (ie, I don't have to redo this again).

Yes, thats fine, I will fix it and apply.

Geert: are you ok with the changes?

Thanks
Greg


------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     gerg@snapgear.com
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
8 Gardner Close                             FAX:         +61 7 3217 5323
Milton, QLD, 4064, Australia                WEB: http://www.SnapGear.com

Re: [PATCH 12/21 v2] m68k: drop unused Kconfig symbols

[Geert Uytterhoeven]

On Thu, Oct 20, 2011 at 07:25, Greg Ungerer <gerg@snapgear.com> wrote:
> Geert: are you ok with the changes?

Yep, fine for me.

Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

BTW, a few of the *_SCC symbols became orphaned, too.

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 12/21 v2] m68k: drop unused Kconfig symbols

[Paul Bolle]

On Thu, 2011-10-20 at 08:54 +0200, Geert Uytterhoeven wrote:
> BTW, a few of the *_SCC symbols became orphaned, too.

Yes, MVME147_SCC, MVME162_SCC and BVME6000_SCC look unused. I missed
those because of these lines:
config SERIAL_CONSOLE
        bool "Support for serial port console"
        depends on [..] MVME147_SCC || [...] MVME162_SCC || BVME6000_SCC [...]

The scripts I used aren't smart enough to evaluate a second instance of
these symbols. One of the simple heuristics they used was: "mentioned a
second time in any of the Kconfig files means it is used".

I haven't yet discovered a smarter way to do this. In this case that
might be: if any other usage of the symbol in the Kconfig doesn't
"select" any other symbol it is unused (provided, of course, there's no
instance of CONFIG_$symbol in any non-Kconfig file) . But I don't know
if that will work. Moreover, this requires an actual parser of the
Kconfig syntax. I've chosen to keep things as dumb as possible, and use
as little understanding of the Kconfig syntax as possible. I still found
quite a number of unused symbols with an acceptable signal to noise
ratio. False-negatives like these are the downside.


Paul Bolle

Re: [PATCH 12/21 v2] m68k: drop unused Kconfig symbols

[Paul Bolle]

On Thu, 2011-10-20 at 15:25 +1000, Greg Ungerer wrote:
> Yes, that is the idea. The configurer doesn't need to know it has
> no effect (at least currently anyway). But they know that the board
> is supported.

I'm not too fond of control knobs connected to nothing (which this
Kconfig entry now is). Maybe I'll propose an alternative, one day.

> Yes, thats fine, I will fix it and apply.

Thanks.


Paul Bolle