aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/cio/cio.c
diff options
context:
space:
mode:
authorSebastian Ott <sebott@linux.vnet.ibm.com>2009-09-11 04:28:25 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2009-09-11 04:29:40 -0400
commit6ee4fec6be06f7d138860b37cba58982cc3ccb16 (patch)
tree51e7e2e1223d95f3c2d7a4a33c8f84758fe8690c /drivers/s390/cio/cio.c
parentab6aae09024be1b039df441fa1b64dbe092d0acb (diff)
[S390] cio: remove subchannel init_name
We used the init_name to set the console subchannels name early at the boot stage. With the patch cio: fix memleak in subchannel validation we moved the name setting to the point where we actually register the console subchannel. At this time we can do dynamic allocations and therefore use dev_set_name. Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/cio/cio.c')
-rw-r--r--drivers/s390/cio/cio.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index fe18ef691bb7..138124fcfcad 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -667,7 +667,6 @@ void __irq_entry do_IRQ(struct pt_regs *regs)
667 667
668#ifdef CONFIG_CCW_CONSOLE 668#ifdef CONFIG_CCW_CONSOLE
669static struct subchannel console_subchannel; 669static struct subchannel console_subchannel;
670static char console_sch_name[10] = "0.x.xxxx";
671static struct io_subchannel_private console_priv; 670static struct io_subchannel_private console_priv;
672static int console_subchannel_in_use; 671static int console_subchannel_in_use;
673 672
@@ -854,12 +853,6 @@ cio_get_console_subchannel(void)
854 return &console_subchannel; 853 return &console_subchannel;
855} 854}
856 855
857const char *cio_get_console_sch_name(struct subchannel_id schid)
858{
859 snprintf(console_sch_name, 10, "0.%x.%04x", schid.ssid, schid.sch_no);
860 return (const char *)console_sch_name;
861}
862
863#endif 856#endif
864static int 857static int
865__disable_subchannel_easy(struct subchannel_id schid, struct schib *schib) 858__disable_subchannel_easy(struct subchannel_id schid, struct schib *schib)