[Qemu-devel] [PATCH 3/4] hw/s390x: Remove superfluous return statements

[Thomas Huth]

The "return;" statements at the end of functions do not make
much sense, so let's remove them.

Cc: Cornelia Huck <address@hidden>
Cc: Christian Borntraeger <address@hidden>
Cc: Alexander Graf <address@hidden>
Cc: Richard Henderson <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
---
 hw/s390x/css.c            |  1 -
 hw/s390x/event-facility.c | 21 ++++++---------------
 hw/s390x/s390-pci-bus.c   |  4 ----
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/hw/s390x/css.c b/hw/s390x/css.c
index c033612..48ba1fd 100644
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -1424,7 +1424,6 @@ void subch_device_save(SubchDev *s, QEMUFile *f)
     }
     qemu_put_byte(f, s->ccw_fmt_1);
     qemu_put_byte(f, s->ccw_no_data_cnt);
-    return;
 }
 
 int subch_device_load(SubchDev *s, QEMUFile *f)
diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
index 907b485..7551685 100644
--- a/hw/s390x/event-facility.c
+++ b/hw/s390x/event-facility.c
@@ -158,11 +158,11 @@ static void write_event_data(SCLPEventFacility *ef, SCCB 
*sccb)
 {
     if (sccb->h.function_code != SCLP_FC_NORMAL_WRITE) {
         sccb->h.response_code = cpu_to_be16(SCLP_RC_INVALID_FUNCTION);
-        goto out;
+        return;
     }
     if (be16_to_cpu(sccb->h.length) < 8) {
         sccb->h.response_code = cpu_to_be16(SCLP_RC_INSUFFICIENT_SCCB_LENGTH);
-        goto out;
+        return;
     }
     /* first do a sanity check of the write events */
     sccb->h.response_code = cpu_to_be16(write_event_length_check(sccb));
@@ -172,9 +172,6 @@ static void write_event_data(SCLPEventFacility *ef, SCCB 
*sccb)
         sccb->h.response_code =
                 cpu_to_be16(handle_sccb_write_events(ef, sccb));
     }
-
-out:
-    return;
 }
 
 static uint16_t handle_sccb_read_events(SCLPEventFacility *ef, SCCB *sccb,
@@ -227,7 +224,7 @@ static void read_event_data(SCLPEventFacility *ef, SCCB 
*sccb)
 
     if (be16_to_cpu(sccb->h.length) != SCCB_SIZE) {
         sccb->h.response_code = cpu_to_be16(SCLP_RC_INSUFFICIENT_SCCB_LENGTH);
-        goto out;
+        return;
     }
 
     sclp_cp_receive_mask = ef->receive_mask;
@@ -243,18 +240,15 @@ static void read_event_data(SCLPEventFacility *ef, SCCB 
*sccb)
             (sclp_active_selection_mask & ~sclp_cp_receive_mask)) {
             sccb->h.response_code =
                     cpu_to_be16(SCLP_RC_INVALID_SELECTION_MASK);
-            goto out;
+            return;
         }
         break;
     default:
         sccb->h.response_code = cpu_to_be16(SCLP_RC_INVALID_FUNCTION);
-        goto out;
+        return;
     }
     sccb->h.response_code = cpu_to_be16(
             handle_sccb_read_events(ef, sccb, sclp_active_selection_mask));
-
-out:
-    return;
 }
 
 static void write_event_mask(SCLPEventFacility *ef, SCCB *sccb)
@@ -265,7 +259,7 @@ static void write_event_mask(SCLPEventFacility *ef, SCCB 
*sccb)
        does. Architecture allows for masks of variable size, though */
     if (be16_to_cpu(we_mask->mask_length) != 4) {
         sccb->h.response_code = cpu_to_be16(SCLP_RC_INVALID_MASK_LENGTH);
-        goto out;
+        return;
     }
 
     /* keep track of the guest's capability masks */
@@ -276,9 +270,6 @@ static void write_event_mask(SCLPEventFacility *ef, SCCB 
*sccb)
     we_mask->receive_mask = cpu_to_be32(get_host_receive_mask(ef));
 
     sccb->h.response_code = cpu_to_be16(SCLP_RC_NORMAL_COMPLETION);
-
-out:
-    return;
 }
 
 /* qemu object creation and initialization functions */
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index 560b66a..6be699b 100644
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -123,7 +123,6 @@ void s390_pci_sclp_configure(int configure, SCCB *sccb)
     }
 
     psccb->header.response_code = cpu_to_be16(rc);
-    return;
 }
 
 static uint32_t s390_pci_get_pfid(PCIDevice *pdev)
@@ -435,8 +434,6 @@ static void s390_msi_ctrl_write(void *opaque, hwaddr addr, 
uint64_t data,
         io_int_word = (pbdev->isc << 27) | IO_INT_WORD_AI;
         s390_io_interrupt(0, 0, 0, io_int_word);
     }
-
-    return;
 }
 
 static uint64_t s390_msi_ctrl_read(void *opaque, hwaddr addr, unsigned size)
@@ -539,7 +536,6 @@ static void s390_pcihost_hot_plug(HotplugHandler 
*hotplug_dev,
         s390_pci_generate_plug_event(HP_EVENT_TO_CONFIGURED,
                                      pbdev->fh, pbdev->fid);
     }
-    return;
 }
 
 static void s390_pcihost_hot_unplug(HotplugHandler *hotplug_dev,
-- 
1.8.3.1