Skip to content

Commit 8587af9

Browse files
hcahcaAlexander Gordeev
authored andcommitted
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>
1 parent 77aba6a commit 8587af9

2 files changed

Lines changed: 0 additions & 14 deletions

File tree

drivers/s390/char/Kconfig

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,6 @@ config HMC_DRV
8585
transfer cache size from its default value 0.5MB to N bytes. If N
8686
is zero, then no caching is performed.
8787

88-
config SCLP_OFB
89-
def_bool n
90-
prompt "Support for Open-for-Business SCLP Event"
91-
depends on S390
92-
help
93-
This option enables the Open-for-Business interface to the s390
94-
Service Element.
95-
9688
config S390_UV_UAPI
9789
def_tristate m
9890
prompt "Ultravisor userspace API"

drivers/s390/char/sclp_config.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,11 @@ static void sclp_conf_receiver_fn(struct evbuf_header *evbuf)
8080

8181
static struct sclp_register sclp_conf_register =
8282
{
83-
#ifdef CONFIG_SCLP_OFB
8483
.send_mask = EVTYP_CONFMGMDATA_MASK,
85-
#endif
8684
.receive_mask = EVTYP_CONFMGMDATA_MASK,
8785
.receiver_fn = sclp_conf_receiver_fn,
8886
};
8987

90-
#ifdef CONFIG_SCLP_OFB
9188
static int sclp_ofb_send_req(char *ev_data, size_t len)
9289
{
9390
static DEFINE_MUTEX(send_mutex);
@@ -143,11 +140,9 @@ static const struct bin_attribute ofb_bin_attr = {
143140
},
144141
.write = sysfs_ofb_data_write,
145142
};
146-
#endif
147143

148144
static int __init sclp_ofb_setup(void)
149145
{
150-
#ifdef CONFIG_SCLP_OFB
151146
struct kset *ofb_kset;
152147
int rc;
153148

@@ -159,7 +154,6 @@ static int __init sclp_ofb_setup(void)
159154
kset_unregister(ofb_kset);
160155
return rc;
161156
}
162-
#endif
163157
return 0;
164158
}
165159

0 commit comments

Comments
 (0)