summaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorMichael Holzheu <holzheu@linux.vnet.ibm.com>2013-11-13 10:38:27 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2013-11-15 14:08:41 +0100
commit7b50da53f6ad2048241bef232bfc22a132a40283 (patch)
treed8cdf310a750de86e63c4831de2fa22affa350b4 /drivers/s390
parentacf6a004e6a35dad17032e3b7c5a046c29957e65 (diff)
downloadlinux-7b50da53f6ad2048241bef232bfc22a132a40283.tar.bz2
s390/sclp: Consolidate early sclp init calls to sclp_early_detect()
The new function calls the old ones. The sclp_event_mask_early() is removed and replaced by one invocation of sclp_set_event_mask(0, 0). Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/char/sclp_early.c27
1 files changed, 9 insertions, 18 deletions
diff --git a/drivers/s390/char/sclp_early.c b/drivers/s390/char/sclp_early.c
index cbec45fdcc59..f7aa080e9b28 100644
--- a/drivers/s390/char/sclp_early.c
+++ b/drivers/s390/char/sclp_early.c
@@ -93,20 +93,7 @@ static void __init sclp_read_info_early(void)
}
}
-static void __init sclp_event_mask_early(void)
-{
- struct init_sccb *sccb = &early_event_mask_sccb;
- int rc;
-
- do {
- memset(sccb, 0, sizeof(*sccb));
- sccb->header.length = sizeof(*sccb);
- sccb->mask_length = sizeof(sccb_mask_t);
- rc = sclp_cmd_sync_early(SCLP_CMDW_WRITE_EVENT_MASK, sccb);
- } while (rc == -EBUSY);
-}
-
-void __init sclp_facilities_detect(void)
+static void __init sclp_facilities_detect(void)
{
struct read_info_sccb *sccb;
@@ -122,8 +109,6 @@ void __init sclp_facilities_detect(void)
sclp_rnmax = sccb->rnmax ? sccb->rnmax : sccb->rnmax2;
sclp_rzm = sccb->rnsize ? sccb->rnsize : sccb->rnsize2;
sclp_rzm <<= 20;
-
- sclp_event_mask_early();
}
bool __init sclp_has_linemode(void)
@@ -246,7 +231,7 @@ unsigned long sclp_get_hsa_size(void)
return sclp_hsa_size;
}
-void __init sclp_hsa_size_detect(void)
+static void __init sclp_hsa_size_detect(void)
{
long size;
@@ -268,6 +253,12 @@ void __init sclp_hsa_size_detect(void)
if (size < 0)
return;
out:
- sclp_set_event_mask(0, 0);
sclp_hsa_size = size;
}
+
+void __init sclp_early_detect(void)
+{
+ sclp_facilities_detect();
+ sclp_hsa_size_detect();
+ sclp_set_event_mask(0, 0);
+}