Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 155eeb66 authored by Hendrik Brueckner's avatar Hendrik Brueckner Committed by Martin Schwidefsky
Browse files

s390/sclp_cpi: remove sclp_cpi module in favor of sysfs interface 



Since commit c05ffc4f ("[S390] sclp: sysfs interface for
SCLP cpi"), which was made 2008 the user can specify a system
and sysplex name through the /sys/firmware/cpi interface.  In
addition to sysplex and system name, the user can also override
the system type and system version.

Because the syfs interface is easier to use and allows the
settings to be updated, the sclp_cpi module becomes obsolete
and can be removed.

Signed-off-by: default avatarHendrik Brueckner <brueckner@linux.vnet.ibm.com>
Acked-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Acked-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent a6e975c5

drivers/s390/char/Kconfig

+0 −13
Original line number Original line Diff line number Diff line
@@ -78,19 +78,6 @@ config SCLP_VT220_CONSOLE 
	  Include support for using an IBM SCLP VT220-compatible terminal as a

	  Include support for using an IBM SCLP VT220-compatible terminal as a

	  Linux system console.

	  Linux system console.





config SCLP_CPI

	def_tristate m

	prompt "Control-Program Identification"

	depends on S390

	help

	  This option enables the hardware console interface for system

	  identification. This is commonly used for workload management and

	  gives you a nice name for the system on the service element.

	  Please select this option as a module since built-in operation is

	  completely untested.

	  You should only select this option if you know what you are doing,

	  need this feature and intend to run your kernel in LPAR.



config SCLP_ASYNC

config SCLP_ASYNC

	def_tristate m

	def_tristate m

	prompt "Support for Call Home via Asynchronous SCLP Records"

	prompt "Support for Call Home via Asynchronous SCLP Records"

drivers/s390/char/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,6 @@ obj-$(CONFIG_TN3215) += con3215.o 
obj-$(CONFIG_SCLP_TTY) += sclp_tty.o

obj-$(CONFIG_SCLP_TTY) += sclp_tty.o

obj-$(CONFIG_SCLP_CONSOLE) += sclp_con.o

obj-$(CONFIG_SCLP_CONSOLE) += sclp_con.o

obj-$(CONFIG_SCLP_VT220_TTY) += sclp_vt220.o

obj-$(CONFIG_SCLP_VT220_TTY) += sclp_vt220.o

obj-$(CONFIG_SCLP_CPI) += sclp_cpi.o

obj-$(CONFIG_SCLP_ASYNC) += sclp_async.o

obj-$(CONFIG_SCLP_ASYNC) += sclp_async.o





obj-$(CONFIG_VMLOGRDR) += vmlogrdr.o

obj-$(CONFIG_VMLOGRDR) += vmlogrdr.o

drivers/s390/char/sclp_cpi.c

deleted100644 → 0
+0 −40
Original line number Original line Diff line number Diff line 
/*

 *    SCLP control programm identification

 *

 *    Copyright IBM Corp. 2001, 2007

 *    Author(s): Martin Peschke <mpeschke@de.ibm.com>

 *		 Michael Ernst <mernst@de.ibm.com>

 */



#include <linux/kmod.h>

#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/version.h>

#include "sclp_cpi_sys.h"



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Identify this operating system instance "

		   "to the System z hardware");

MODULE_AUTHOR("Martin Peschke <mpeschke@de.ibm.com>, "

	      "Michael Ernst <mernst@de.ibm.com>");



static char *system_name = "";

static char *sysplex_name = "";



module_param(system_name, charp, 0);

MODULE_PARM_DESC(system_name, "e.g. hostname - max. 8 characters");

module_param(sysplex_name, charp, 0);

MODULE_PARM_DESC(sysplex_name, "if applicable - max. 8 characters");



static int __init cpi_module_init(void)

{

	return sclp_cpi_set_data(system_name, sysplex_name, "LINUX",

				 LINUX_VERSION_CODE);

}



static void __exit cpi_module_exit(void)

{

}



module_init(cpi_module_init);

module_exit(cpi_module_exit);