Skip to content

Commit

Permalink
s390/sclp: replace uninitialized early_event_mask_sccb variable with …
Browse files Browse the repository at this point in the history
…sccb_early

Commit "s390/sclp: Consolidate early sclp init calls to sclp_early_detect()"
(7b50da5) replaced the sclp_event_mask_early()
with sclp_set_event_mask().  The early_event_mask_sccb variable is no longer
initialized but is still used in sclp_has_linemode() and sclp_has_vt220().

Replace early_event_mask_sccb with the sccb_early variable in both
functions.

Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  • Loading branch information
Hendrik Brueckner authored and Martin Schwidefsky committed Dec 2, 2013
1 parent b2b0154 commit 9e3ea19
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/s390/char/sclp_early.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ struct read_info_sccb {
u8 _reserved5[4096 - 112]; /* 112-4095 */
} __packed __aligned(PAGE_SIZE);

static __initdata struct init_sccb early_event_mask_sccb __aligned(PAGE_SIZE);
static __initdata struct read_info_sccb early_read_info_sccb;
static __initdata char sccb_early[PAGE_SIZE] __aligned(PAGE_SIZE);
static unsigned long sclp_hsa_size;
Expand Down Expand Up @@ -113,7 +112,7 @@ static void __init sclp_facilities_detect(void)

bool __init sclp_has_linemode(void)
{
struct init_sccb *sccb = &early_event_mask_sccb;
struct init_sccb *sccb = (void *) &sccb_early;

if (sccb->header.response_code != 0x20)
return 0;
Expand All @@ -126,7 +125,7 @@ bool __init sclp_has_linemode(void)

bool __init sclp_has_vt220(void)
{
struct init_sccb *sccb = &early_event_mask_sccb;
struct init_sccb *sccb = (void *) &sccb_early;

if (sccb->header.response_code != 0x20)
return 0;
Expand Down

0 comments on commit 9e3ea19

Please sign in to comment.