Commit 8587af9c authored by Heiko Carstens's avatar Heiko Carstens Committed by Alexander Gordeev
Browse files

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: default avatarChristian Borntraeger <borntraeger@linux.ibm.com>
Acked-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
parent 77aba6ac

drivers/s390/char/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -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"

drivers/s390/char/sclp_config.c

+0 −6
Original line number Diff line number Diff line
@@ -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;

}