| Message ID | 20200106182425.20312-39-danielhb413@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | trivial unneeded labels cleanup | expand |
On 06/01/2020 19.24, Daniel Henrique Barboza wrote: > 'out' label can be replaced by 'return' with the appropriate > value. The 'r' integer, which is used solely to set the > return value for this label, can also be removed. > > CC: Cornelia Huck <cohuck@redhat.com> > CC: Halil Pasic <pasic@linux.ibm.com> > CC: Christian Borntraeger <borntraeger@de.ibm.com> > Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> > --- > hw/s390x/sclp.c | 16 +++++----------- > 1 file changed, 5 insertions(+), 11 deletions(-) > > diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c > index f57ce7b739..af0bfbc2ec 100644 > --- a/hw/s390x/sclp.c > +++ b/hw/s390x/sclp.c > @@ -197,24 +197,20 @@ int sclp_service_call(CPUS390XState *env, uint64_t sccb, uint32_t code) > { > SCLPDevice *sclp = get_sclp_device(); > SCLPDeviceClass *sclp_c = SCLP_GET_CLASS(sclp); > - int r = 0; > SCCB work_sccb; > > hwaddr sccb_len = sizeof(SCCB); > > /* first some basic checks on program checks */ > if (env->psw.mask & PSW_MASK_PSTATE) { > - r = -PGM_PRIVILEGED; > - goto out; > + return -PGM_PRIVILEGED; > } > if (cpu_physical_memory_is_io(sccb)) { > - r = -PGM_ADDRESSING; > - goto out; > + return -PGM_ADDRESSING; > } > if ((sccb & ~0x1fffUL) == 0 || (sccb & ~0x1fffUL) == env->psa > || (sccb & ~0x7ffffff8UL) != 0) { > - r = -PGM_SPECIFICATION; > - goto out; > + return -PGM_SPECIFICATION; > } > > /* > @@ -226,8 +222,7 @@ int sclp_service_call(CPUS390XState *env, uint64_t sccb, uint32_t code) > > /* Valid sccb sizes */ > if (be16_to_cpu(work_sccb.h.length) < sizeof(SCCBHeader)) { > - r = -PGM_SPECIFICATION; > - goto out; > + return -PGM_SPECIFICATION; > } > > switch (code & SCLP_CMD_CODE_MASK) { > @@ -257,8 +252,7 @@ out_write: > > sclp_c->service_interrupt(sclp, sccb); > > -out: > - return r; > + return 0; > } > > static void service_interrupt(SCLPDevice *sclp, uint32_t sccb) > Reviewed-by: Thomas Huth <thuth@redhat.com>
On Mon, 6 Jan 2020 15:24:04 -0300 Daniel Henrique Barboza <danielhb413@gmail.com> wrote: > 'out' label can be replaced by 'return' with the appropriate > value. The 'r' integer, which is used solely to set the > return value for this label, can also be removed. > > CC: Cornelia Huck <cohuck@redhat.com> > CC: Halil Pasic <pasic@linux.ibm.com> > CC: Christian Borntraeger <borntraeger@de.ibm.com> > Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> > --- > hw/s390x/sclp.c | 16 +++++----------- > 1 file changed, 5 insertions(+), 11 deletions(-) Thanks, applied.
diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index f57ce7b739..af0bfbc2ec 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -197,24 +197,20 @@ int sclp_service_call(CPUS390XState *env, uint64_t sccb, uint32_t code) { SCLPDevice *sclp = get_sclp_device(); SCLPDeviceClass *sclp_c = SCLP_GET_CLASS(sclp); - int r = 0; SCCB work_sccb; hwaddr sccb_len = sizeof(SCCB); /* first some basic checks on program checks */ if (env->psw.mask & PSW_MASK_PSTATE) { - r = -PGM_PRIVILEGED; - goto out; + return -PGM_PRIVILEGED; } if (cpu_physical_memory_is_io(sccb)) { - r = -PGM_ADDRESSING; - goto out; + return -PGM_ADDRESSING; } if ((sccb & ~0x1fffUL) == 0 || (sccb & ~0x1fffUL) == env->psa || (sccb & ~0x7ffffff8UL) != 0) { - r = -PGM_SPECIFICATION; - goto out; + return -PGM_SPECIFICATION; } /* @@ -226,8 +222,7 @@ int sclp_service_call(CPUS390XState *env, uint64_t sccb, uint32_t code) /* Valid sccb sizes */ if (be16_to_cpu(work_sccb.h.length) < sizeof(SCCBHeader)) { - r = -PGM_SPECIFICATION; - goto out; + return -PGM_SPECIFICATION; } switch (code & SCLP_CMD_CODE_MASK) { @@ -257,8 +252,7 @@ out_write: sclp_c->service_interrupt(sclp, sccb); -out: - return r; + return 0; } static void service_interrupt(SCLPDevice *sclp, uint32_t sccb)
'out' label can be replaced by 'return' with the appropriate value. The 'r' integer, which is used solely to set the return value for this label, can also be removed. CC: Cornelia Huck <cohuck@redhat.com> CC: Halil Pasic <pasic@linux.ibm.com> CC: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- hw/s390x/sclp.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)