[S390] cleanup s390 Kconfig

Make use of def_bool and def_tristate where possible and add sensible
defaults to the config symbols where applicable. This shortens the
defconfig file by another ~40 lines.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

3 files changed, 88 insertions, 56 deletions

diff --git a/drivers/s390/block/Kconfig b/drivers/s390/block/Kconfig
index 07883197f474..8e477bb1f3f6 100644
--- a/drivers/s390/block/Kconfig
+++ b/drivers/s390/block/Kconfig
@@ -2,7 +2,8 @@ comment "S/390 block device drivers"
         depends on S390 && BLOCK
 
 config BLK_DEV_XPRAM
-        tristate "XPRAM disk support"
+        def_tristate m
+        prompt "XPRAM disk support"
         depends on S390 && BLOCK
         help
           Select this option if you want to use your expanded storage on S/390
@@ -12,13 +13,15 @@ config BLK_DEV_XPRAM
           xpram.  If unsure, say "N".
 
 config DCSSBLK
-        tristate "DCSSBLK support"
+        def_tristate m
+        prompt "DCSSBLK support"
         depends on S390 && BLOCK
         help
           Support for dcss block device
 
 config DASD
-        tristate "Support for DASD devices"
+        def_tristate y
+        prompt "Support for DASD devices"
         depends on CCW && BLOCK
         select IOSCHED_DEADLINE
         help
@@ -27,28 +30,32 @@ config DASD
           natively on a single image or an LPAR.
 
 config DASD_PROFILE
-        bool "Profiling support for dasd devices"
+        def_bool y
+        prompt "Profiling support for dasd devices"
         depends on DASD
         help
           Enable this option if you want to see profiling information
           in /proc/dasd/statistics.
 
 config DASD_ECKD
-        tristate "Support for ECKD Disks"
+        def_tristate y
+        prompt "Support for ECKD Disks"
         depends on DASD
         help
           ECKD devices are the most commonly used devices. You should enable
           this option unless you are very sure to have no ECKD device.
 
 config DASD_FBA
-        tristate "Support for FBA  Disks"
+        def_tristate y
+        prompt "Support for FBA  Disks"
         depends on DASD
         help
           Select this option to be able to access FBA devices. It is safe to
           say "Y".
 
 config DASD_DIAG
-        tristate "Support for DIAG access to Disks"
+        def_tristate y
+        prompt "Support for DIAG access to Disks"
         depends on DASD
         help
           Select this option if you want to use Diagnose250 command to access
@@ -56,7 +63,8 @@ config DASD_DIAG
           say "N".
 
 config DASD_EER
-        bool "Extended error reporting (EER)"
+        def_bool y
+        prompt "Extended error reporting (EER)"
         depends on DASD
         help
           This driver provides a character device interface to the
diff --git a/drivers/s390/char/Kconfig b/drivers/s390/char/Kconfig
index 40834f18754c..dcee3c5c8954 100644
--- a/drivers/s390/char/Kconfig
+++ b/drivers/s390/char/Kconfig
@@ -2,76 +2,85 @@ comment "S/390 character device drivers"
         depends on S390
 
 config TN3270
-        tristate "Support for locally attached 3270 terminals"
+        def_tristate y
+        prompt "Support for locally attached 3270 terminals"
         depends on CCW
         help
           Include support for IBM 3270 terminals.
 
 config TN3270_TTY
-        tristate "Support for tty input/output on 3270 terminals"
+        def_tristate y
+        prompt "Support for tty input/output on 3270 terminals"
         depends on TN3270
         help
           Include support for using an IBM 3270 terminal as a Linux tty.
 
 config TN3270_FS
-        tristate "Support for fullscreen applications on 3270 terminals"
+        def_tristate m
+        prompt "Support for fullscreen applications on 3270 terminals"
         depends on TN3270
         help
           Include support for fullscreen applications on an IBM 3270 terminal.
 
 config TN3270_CONSOLE
-        bool "Support for console on 3270 terminal"
+        def_bool y
+        prompt "Support for console on 3270 terminal"
         depends on TN3270=y && TN3270_TTY=y
         help
           Include support for using an IBM 3270 terminal as a Linux system
           console.  Available only if 3270 support is compiled in statically.
 
 config TN3215
-        bool "Support for 3215 line mode terminal"
+        def_bool y
+        prompt "Support for 3215 line mode terminal"
         depends on CCW
         help
           Include support for IBM 3215 line-mode terminals.
 
 config TN3215_CONSOLE
-        bool "Support for console on 3215 line mode terminal"
+        def_bool y
+        prompt "Support for console on 3215 line mode terminal"
         depends on TN3215
         help
           Include support for using an IBM 3215 line-mode terminal as a
           Linux system console.
 
 config CCW_CONSOLE
-        bool
-        depends on TN3215_CONSOLE || TN3270_CONSOLE
-        default y
+        def_bool y if TN3215_CONSOLE || TN3270_CONSOLE
 
 config SCLP_TTY
-        bool "Support for SCLP line mode terminal"
+        def_bool y
+        prompt "Support for SCLP line mode terminal"
         depends on S390
         help
           Include support for IBM SCLP line-mode terminals.
 
 config SCLP_CONSOLE
-        bool "Support for console on SCLP line mode terminal"
+        def_bool y
+        prompt "Support for console on SCLP line mode terminal"
         depends on SCLP_TTY
         help
           Include support for using an IBM HWC line-mode terminal as the Linux
           system console.
 
 config SCLP_VT220_TTY
-        bool "Support for SCLP VT220-compatible terminal"
+        def_bool y
+        prompt "Support for SCLP VT220-compatible terminal"
         depends on S390
         help
           Include support for an IBM SCLP VT220-compatible terminal.
 
 config SCLP_VT220_CONSOLE
-        bool "Support for console on SCLP VT220-compatible terminal"
+        def_bool y
+        prompt "Support for console on SCLP VT220-compatible terminal"
         depends on SCLP_VT220_TTY
         help
           Include support for using an IBM SCLP VT220-compatible terminal as a
           Linux system console.
 
 config SCLP_CPI
-        tristate "Control-Program Identification"
+        def_tristate m
+        prompt "Control-Program Identification"
         depends on S390
         help
           This option enables the hardware console interface for system
@@ -83,7 +92,8 @@ config SCLP_CPI
           need this feature and intend to run your kernel in LPAR.
 
 config SCLP_ASYNC
-        tristate "Support for Call Home via Asynchronous SCLP Records"
+        def_tristate m
+        prompt "Support for Call Home via Asynchronous SCLP Records"
         depends on S390
         help
           This option enables the call home function, which is able to inform
@@ -93,7 +103,8 @@ config SCLP_ASYNC
           need this feature and intend to run your kernel in LPAR.
 
 config S390_TAPE
-        tristate "S/390 tape device support"
+        def_tristate m
+        prompt "S/390 tape device support"
         depends on CCW
         help
           Select this option if you want to access channel-attached tape
@@ -109,7 +120,8 @@ comment "S/390 tape interface support"
         depends on S390_TAPE
 
 config S390_TAPE_BLOCK
-        bool "Support for tape block devices"
+        def_bool y
+        prompt "Support for tape block devices"
         depends on S390_TAPE && BLOCK
         help
           Select this option if you want to access your channel-attached tape
@@ -123,7 +135,8 @@ comment "S/390 tape hardware support"
         depends on S390_TAPE
 
 config S390_TAPE_34XX
-        tristate "Support for 3480/3490 tape hardware"
+        def_tristate m
+        prompt "Support for 3480/3490 tape hardware"
         depends on S390_TAPE
         help
           Select this option if you want to access IBM 3480/3490 magnetic
@@ -131,7 +144,8 @@ config S390_TAPE_34XX
           It is safe to say "Y" here.
 
 config S390_TAPE_3590
-        tristate "Support for 3590 tape hardware"
+        def_tristate m
+        prompt "Support for 3590 tape hardware"
         depends on S390_TAPE
         help
           Select this option if you want to access IBM 3590 magnetic
@@ -139,7 +153,8 @@ config S390_TAPE_3590
           It is safe to say "Y" here.
 
 config VMLOGRDR
-        tristate "Support for the z/VM recording system services (VM only)"
+        def_tristate m
+        prompt "Support for the z/VM recording system services (VM only)"
         depends on IUCV
         help
           Select this option if you want to be able to receive records collected
@@ -148,29 +163,31 @@ config VMLOGRDR
           This driver depends on the IUCV support driver.
 
 config VMCP
-        bool "Support for the z/VM CP interface"
+        def_bool y
+        prompt "Support for the z/VM CP interface"
         depends on S390
         help
           Select this option if you want to be able to interact with the control
           program on z/VM
 
 config MONREADER
-        tristate "API for reading z/VM monitor service records"
+        def_tristate m
+        prompt "API for reading z/VM monitor service records"
         depends on IUCV
         help
           Character device driver for reading z/VM monitor service records
 
 config MONWRITER
-        tristate "API for writing z/VM monitor service records"
+        def_tristate m
+        prompt "API for writing z/VM monitor service records"
         depends on S390
-        default "m"
         help
           Character device driver for writing z/VM monitor service records
 
 config S390_VMUR
-        tristate "z/VM unit record device driver"
+        def_tristate m
+        prompt "z/VM unit record device driver"
         depends on S390
-        default "m"
         help
           Character device driver for z/VM reader, puncher and printer.
 
diff --git a/drivers/s390/net/Kconfig b/drivers/s390/net/Kconfig
index 456b18743397..fa80ba1f0344 100644
--- a/drivers/s390/net/Kconfig
+++ b/drivers/s390/net/Kconfig
@@ -2,7 +2,8 @@ menu "S/390 network device drivers"
         depends on NETDEVICES && S390
 
 config LCS
-        tristate "Lan Channel Station Interface"
+        def_tristate m
+        prompt "Lan Channel Station Interface"
         depends on CCW && NETDEVICES && (NET_ETHERNET || TR || FDDI)
         help
            Select this option if you want to use LCS networking on IBM System z.
@@ -12,7 +13,8 @@ config LCS
            If you do not know what it is, it's safe to choose Y.
 
 config CTCM
-        tristate "CTC and MPC SNA device support"
+        def_tristate m
+        prompt "CTC and MPC SNA device support"
         depends on CCW && NETDEVICES
         help
           Select this option if you want to use channel-to-channel
@@ -26,7 +28,8 @@ config CTCM
           If you do not need any channel-to-channel connection, choose N.
 
 config NETIUCV
-        tristate "IUCV network device support (VM only)"
+        def_tristate m
+        prompt "IUCV network device support (VM only)"
         depends on IUCV && NETDEVICES
         help
           Select this option if you want to use inter-user communication
@@ -37,14 +40,16 @@ config NETIUCV
           The module name is netiucv. If unsure, choose Y.
 
 config SMSGIUCV
-        tristate "IUCV special message support (VM only)"
+        def_tristate m
+        prompt "IUCV special message support (VM only)"
         depends on IUCV
         help
           Select this option if you want to be able to receive SMSG messages
           from other VM guest systems.
 
 config SMSGIUCV_EVENT
-        tristate "Deliver IUCV special messages as uevents (VM only)"
+        def_tristate m
+        prompt "Deliver IUCV special messages as uevents (VM only)"
         depends on SMSGIUCV
         help
           Select this option to deliver CP special messages (SMSGs) as
@@ -54,7 +59,8 @@ config SMSGIUCV_EVENT
           To compile as a module, choose M. The module name is "smsgiucv_app".
 
 config CLAW
-        tristate "CLAW device support"
+        def_tristate m
+        prompt "CLAW device support"
         depends on CCW && NETDEVICES
         help
           This driver supports channel attached CLAW devices.
@@ -64,7 +70,8 @@ config CLAW
           To compile into the kernel, choose Y.
 
 config QETH
-        tristate "Gigabit Ethernet device support"
+        def_tristate y
+        prompt "Gigabit Ethernet device support"
         depends on CCW && NETDEVICES && IP_MULTICAST && QDIO
         help
           This driver supports the IBM System z OSA Express adapters
@@ -78,25 +85,25 @@ config QETH
           The module name is qeth.
 
 config QETH_L2
-        tristate "qeth layer 2 device support"
-        depends on QETH
-        help
-          Select this option to be able to run qeth devices in layer 2 mode.
-          To compile as a module, choose M. The module name is qeth_l2.
-          If unsure, choose y.
+        def_tristate y
+        prompt "qeth layer 2 device support"
+        depends on QETH
+        help
+          Select this option to be able to run qeth devices in layer 2 mode.
+          To compile as a module, choose M. The module name is qeth_l2.
+          If unsure, choose y.
 
 config QETH_L3
-        tristate "qeth layer 3 device support"
-        depends on QETH
-        help
-          Select this option to be able to run qeth devices in layer 3 mode.
-          To compile as a module choose M. The module name is qeth_l3.
-          If unsure, choose Y.
+        def_tristate y
+        prompt "qeth layer 3 device support"
+        depends on QETH
+        help
+          Select this option to be able to run qeth devices in layer 3 mode.
+          To compile as a module choose M. The module name is qeth_l3.
+          If unsure, choose Y.
 
 config QETH_IPV6
-        bool
-        depends on (QETH_L3 = IPV6) || (QETH_L3 && IPV6 = 'y')
-        default y
+        def_bool y if (QETH_L3 = IPV6) || (QETH_L3 && IPV6 = 'y')
 
 config CCWGROUP
         tristate