s390/sclp: Remove SCLP_OFB Kconfig option

Remove the SCLP_OFB Kconfig option and enable the guarded code
unconditionally. This guards only a few lines of code, so the impact is
very low while at the same time this reduces the large number of Kconfig
options.

Acked-by: Christian Borntraeger <borntraeger@linux.ibm.com>
Acked-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>

diff --git a/drivers/s390/char/Kconfig b/drivers/s390/char/Kconfig
index 4d8f09910a465323819051bb7e9ec55605a9e83d..7416f941e5b6cf4e822ce9b6878df130e9115c33 100644 (file)
--- a/drivers/s390/char/Kconfig
+++ b/drivers/s390/char/Kconfig
@@ -85,14 +85,6 @@ config HMC_DRV
          transfer cache size from its default value 0.5MB to N bytes. If N
          is zero, then no caching is performed.
 
-config SCLP_OFB
-       def_bool n
-       prompt "Support for Open-for-Business SCLP Event"
-       depends on S390
-       help
-         This option enables the Open-for-Business interface to the s390
-         Service Element.
-
 config S390_UV_UAPI
        def_tristate m
        prompt "Ultravisor userspace API"

diff --git a/drivers/s390/char/sclp_config.c b/drivers/s390/char/sclp_config.c
index 9cfbe3fc3dca7e881c119f7c87282b287e1c0ef0..8c77e8c44fc23cf4319a4bbda29dfc15c3882038 100644 (file)
--- a/drivers/s390/char/sclp_config.c
+++ b/drivers/s390/char/sclp_config.c
@@ -80,14 +80,11 @@ static void sclp_conf_receiver_fn(struct evbuf_header *evbuf)
 
 static struct sclp_register sclp_conf_register =
 {
-#ifdef CONFIG_SCLP_OFB
        .send_mask    = EVTYP_CONFMGMDATA_MASK,
-#endif
        .receive_mask = EVTYP_CONFMGMDATA_MASK,
        .receiver_fn  = sclp_conf_receiver_fn,
 };
 
-#ifdef CONFIG_SCLP_OFB
 static int sclp_ofb_send_req(char *ev_data, size_t len)
 {
        static DEFINE_MUTEX(send_mutex);
@@ -143,11 +140,9 @@ static const struct bin_attribute ofb_bin_attr = {
        },
        .write = sysfs_ofb_data_write,
 };
-#endif
 
 static int __init sclp_ofb_setup(void)
 {
-#ifdef CONFIG_SCLP_OFB
        struct kset *ofb_kset;
        int rc;
 
@@ -159,7 +154,6 @@ static int __init sclp_ofb_setup(void)
                kset_unregister(ofb_kset);
                return rc;
        }
-#endif
        return 0;
 }