7 files changed, 1 insertions, 27 deletions

diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index 4c0ec7b46e37..2a2ca268b1dd 100644
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@ -183,10 +183,6 @@ static noinline __init void detect_machine_type(void)
         if (cpuinfo->cpu_id.version == 0xff)
                 machine_flags |= MACHINE_FLAG_VM;
 
-        /* Running on a P/390 ? */
-        if (cpuinfo->cpu_id.machine == 0x7490)
-                machine_flags |= MACHINE_FLAG_P390;
-
         /* Running under KVM ? */
         if (cpuinfo->cpu_id.version == 0xfe)
                 machine_flags |= MACHINE_FLAG_KVM;
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 9c92407f625c..b358e18273b0 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -205,12 +205,6 @@ static void __init conmode_default(void)
                         SET_CONSOLE_SCLP;
 #endif
                 }
-        } else if (MACHINE_IS_P390) {
-#if defined(CONFIG_TN3215_CONSOLE)
-                SET_CONSOLE_3215;
-#elif defined(CONFIG_TN3270_CONSOLE)
-                SET_CONSOLE_3270;
-#endif
         } else {
 #if defined(CONFIG_SCLP_CONSOLE) || defined(CONFIG_SCLP_VT220_CONSOLE)
                 SET_CONSOLE_SCLP;
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index 4b632504c65c..d3ec9b55ab35 100644
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -373,7 +373,7 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
         struct raw3215_req *req;
         struct tty_struct *tty;
         int cstat, dstat;
-        int count, slen;
+        int count;
 
         raw = cdev->dev.driver_data;
         req = (struct raw3215_req *) intparm;
@@ -390,8 +390,6 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
                         break;
                 /* Attention interrupt, someone hit the enter key */
                 raw3215_mk_read_req(raw);
-                if (MACHINE_IS_P390)
-                        memset(raw->inbuf, 0, RAW3215_INBUF_SIZE);
                 tasklet_schedule(&raw->tasklet);
                 break;
         case 0x08:
@@ -414,11 +412,6 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
 
                         tty = raw->tty;
                         count = 160 - req->residual;
-                        if (MACHINE_IS_P390) {
-                                slen = strnlen(raw->inbuf, RAW3215_INBUF_SIZE);
-                                if (count > slen)
-                                        count = slen;
-                        } else
                         EBCASC(raw->inbuf, count);
                         cchar = ctrlchar_handle(raw->inbuf, count, tty);
                         switch (cchar & CTRLCHAR_MASK) {
diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c
index fb97cf5ee674..3c8b25e6c345 100644
--- a/drivers/s390/char/sclp.c
+++ b/drivers/s390/char/sclp.c
@@ -883,8 +883,6 @@ sclp_init(void)
         unsigned long flags;
         int rc;
 
-        if (!MACHINE_HAS_SCLP)
-                return -ENODEV;
         spin_lock_irqsave(&sclp_lock, flags);
         /* Check for previous or running initialization */
         if (sclp_init_state != sclp_init_state_uninitialized) {
diff --git a/drivers/s390/net/cu3088.c b/drivers/s390/net/cu3088.c
index 8e7697305a4c..f4a32375c037 100644
--- a/drivers/s390/net/cu3088.c
+++ b/drivers/s390/net/cu3088.c
@@ -36,7 +36,6 @@ const char *cu3088_type[] = {
         "CTC/A",
         "ESCON channel",
         "FICON channel",
-        "P390 LCS card",
         "OSA LCS card",
         "CLAW channel device",
         "unknown channel type",
@@ -49,7 +48,6 @@ static struct ccw_device_id cu3088_ids[] = {
         { CCW_DEVICE(0x3088, 0x08), .driver_info = channel_type_parallel },
         { CCW_DEVICE(0x3088, 0x1f), .driver_info = channel_type_escon },
         { CCW_DEVICE(0x3088, 0x1e), .driver_info = channel_type_ficon },
-        { CCW_DEVICE(0x3088, 0x01), .driver_info = channel_type_p390 },
         { CCW_DEVICE(0x3088, 0x60), .driver_info = channel_type_osa2 },
         { CCW_DEVICE(0x3088, 0x61), .driver_info = channel_type_claw },
         { /* end of list */ }
diff --git a/drivers/s390/net/cu3088.h b/drivers/s390/net/cu3088.h
index 1753661f702a..d8558a7105a5 100644
--- a/drivers/s390/net/cu3088.h
+++ b/drivers/s390/net/cu3088.h
@@ -17,9 +17,6 @@ enum channel_types {
         /* Device is a FICON channel */
         channel_type_ficon,
 
-        /* Device is a P390 LCS card */
-        channel_type_p390,
-
         /* Device is a OSA2 card */
         channel_type_osa2,
 
diff --git a/include/asm-s390/setup.h b/include/asm-s390/setup.h
index 80747ba6ef8a..f09ee3f72977 100644
--- a/include/asm-s390/setup.h
+++ b/include/asm-s390/setup.h
@@ -65,7 +65,6 @@ extern unsigned long machine_flags;
 
 #define MACHINE_FLAG_VM         (1UL << 0)
 #define MACHINE_FLAG_IEEE       (1UL << 1)
-#define MACHINE_FLAG_P390       (1UL << 2)
 #define MACHINE_FLAG_CSP        (1UL << 3)
 #define MACHINE_FLAG_MVPG       (1UL << 4)
 #define MACHINE_FLAG_DIAG44     (1UL << 5)
@@ -101,7 +100,6 @@ extern unsigned long machine_flags;
 #define MACHINE_HAS_PFMF        (machine_flags & MACHINE_FLAG_PFMF)
 #endif /* __s390x__ */
 
-#define MACHINE_HAS_SCLP        (!MACHINE_IS_P390)
 #define ZFCPDUMP_HSA_SIZE       (32UL<<20)
 
 /*