Le 13/07/2020 à 11:37, Thomas Huth a écrit :
> On 13/07/2020 11.05, Yi Wang wrote:
>> From: Liao Pingfang <liao.pingf...@zte.com.cn>
>>
>> Remove superfluous breaks, as there is a "return" before them.
>>
>> Signed-off-by: Liao Pingfang <liao.pingf...@zte.com.cn>
>> Signed-off-by: Yi Wang <wang.y...@zte.com.cn>
>> Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
>> ---
>> hw/block/pflash_cfi01.c | 1 -
>> hw/display/cirrus_vga.c | 1 -
>> hw/display/qxl-logger.c | 2 --
>> hw/gpio/max7310.c | 3 ---
>> hw/i386/intel_iommu.c | 1 -
>> hw/input/pxa2xx_keypad.c | 10 ----------
>> hw/intc/armv7m_nvic.c | 1 -
>> hw/net/lan9118.c | 2 --
>> hw/usb/ccid-card-emulated.c | 1 -
>> 9 files changed, 22 deletions(-)
>>
>> diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
>> index 8ab1d66..f0fcd63 100644
>> --- a/hw/block/pflash_cfi01.c
>> +++ b/hw/block/pflash_cfi01.c
>> @@ -213,7 +213,6 @@ static uint32_t pflash_devid_query(PFlashCFI01 *pfl,
>> hwaddr offset)
>> default:
>> trace_pflash_device_info(offset);
>> return 0;
>> - break;
>> }
>> /* Replicate responses for each device in bank. */
>> if (pfl->device_width < pfl->bank_width) {
>> diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
>> index 212d6f5..02d9ed0 100644
>> --- a/hw/display/cirrus_vga.c
>> +++ b/hw/display/cirrus_vga.c
>> @@ -1637,7 +1637,6 @@ static int cirrus_vga_read_cr(CirrusVGAState * s,
>> unsigned reg_index)
>> return s->vga.cr[s->vga.cr_index];
>> case 0x26: // Attribute Controller Index Readback
>> (R)
>> return s->vga.ar_index & 0x3f;
>> - break;
>> default:
>> qemu_log_mask(LOG_GUEST_ERROR,
>> "cirrus: inport cr_index 0x%02x\n", reg_index);
>> diff --git a/hw/display/qxl-logger.c b/hw/display/qxl-logger.c
>> index 2ec6d8f..c15175b 100644
>> --- a/hw/display/qxl-logger.c
>> +++ b/hw/display/qxl-logger.c
>> @@ -161,7 +161,6 @@ static int qxl_log_cmd_draw(PCIQXLDevice *qxl,
>> QXLDrawable *draw, int group_id)
>> switch (draw->type) {
>> case QXL_DRAW_COPY:
>> return qxl_log_cmd_draw_copy(qxl, &draw->u.copy, group_id);
>> - break;
>> }
>> return 0;
>> }
>> @@ -180,7 +179,6 @@ static int qxl_log_cmd_draw_compat(PCIQXLDevice *qxl,
>> QXLCompatDrawable *draw,
>> switch (draw->type) {
>> case QXL_DRAW_COPY:
>> return qxl_log_cmd_draw_copy(qxl, &draw->u.copy, group_id);
>> - break;
>> }
>> return 0;
>> }
>> diff --git a/hw/gpio/max7310.c b/hw/gpio/max7310.c
>> index bebb403..4f78774 100644
>> --- a/hw/gpio/max7310.c
>> +++ b/hw/gpio/max7310.c
>> @@ -51,11 +51,9 @@ static uint8_t max7310_rx(I2CSlave *i2c)
>> switch (s->command) {
>> case 0x00: /* Input port */
>> return s->level ^ s->polarity;
>> - break;
>>
>> case 0x01: /* Output port */
>> return s->level & ~s->direction;
>> - break;
>>
>> case 0x02: /* Polarity inversion */
>> return s->polarity;
>> @@ -65,7 +63,6 @@ static uint8_t max7310_rx(I2CSlave *i2c)
>>
>> case 0x04: /* Timeout */
>> return s->status;
>> - break;
>>
>> case 0xff: /* Reserved */
>> return 0xff;
>> diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
>> index c56398e..7b390ca 100644
>> --- a/hw/i386/intel_iommu.c
>> +++ b/hw/i386/intel_iommu.c
>> @@ -3163,7 +3163,6 @@ static int vtd_irte_get(IntelIOMMUState *iommu,
>> uint16_t index,
>> index, entry->irte.sid_vtype);
>> /* Take this as verification failure. */
>> return -VTD_FR_IR_SID_ERR;
>> - break;
>> }
>> }
>>
>> diff --git a/hw/input/pxa2xx_keypad.c b/hw/input/pxa2xx_keypad.c
>> index 62aa6f6..7f2f739 100644
>> --- a/hw/input/pxa2xx_keypad.c
>> +++ b/hw/input/pxa2xx_keypad.c
>> @@ -192,10 +192,8 @@ static uint64_t pxa2xx_keypad_read(void *opaque, hwaddr
>> offset,
>> s->kpc &= ~(KPC_DI);
>> qemu_irq_lower(s->irq);
>> return tmp;
>> - break;
>> case KPDK:
>> return s->kpdk;
>> - break;
>> case KPREC:
>> tmp = s->kprec;
>> if(tmp & KPREC_OF1)
>> @@ -207,31 +205,23 @@ static uint64_t pxa2xx_keypad_read(void *opaque,
>> hwaddr offset,
>> if(tmp & KPREC_UF0)
>> s->kprec &= ~(KPREC_UF0);
>> return tmp;
>> - break;
>> case KPMK:
>> tmp = s->kpmk;
>> if(tmp & KPMK_MKP)
>> s->kpmk &= ~(KPMK_MKP);
>> return tmp;
>> - break;
>> case KPAS:
>> return s->kpas;
>> - break;
>> case KPASMKP0:
>> return s->kpasmkp[0];
>> - break;
>> case KPASMKP1:
>> return s->kpasmkp[1];
>> - break;
>> case KPASMKP2:
>> return s->kpasmkp[2];
>> - break;
>> case KPASMKP3:
>> return s->kpasmkp[3];
>> - break;
>> case KPKDI:
>> return s->kpkdi;
>> - break;
>> default:
>> qemu_log_mask(LOG_GUEST_ERROR,
>> "%s: Bad read offset 0x%"HWADDR_PRIx"\n",
>> diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c
>> index 3c4b6e6..720ac97 100644
>> --- a/hw/intc/armv7m_nvic.c
>> +++ b/hw/intc/armv7m_nvic.c
>> @@ -1275,7 +1275,6 @@ static uint32_t nvic_readl(NVICState *s, uint32_t
>> offset, MemTxAttrs attrs)
>> case 0xd90: /* MPU_TYPE */
>> /* Unified MPU; if the MPU is not present this value is zero */
>> return cpu->pmsav7_dregion << 8;
>> - break;
>> case 0xd94: /* MPU_CTRL */
>> return cpu->env.v7m.mpu_ctrl[attrs.secure];
>> case 0xd98: /* MPU_RNR */
>> diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
>> index 8e2a432..e35f00f 100644
>> --- a/hw/net/lan9118.c
>> +++ b/hw/net/lan9118.c
>> @@ -931,10 +931,8 @@ static uint32_t do_mac_read(lan9118_state *s, int reg)
>> | (s->conf.macaddr.a[2] << 16) | (s->conf.macaddr.a[3] <<
>> 24);
>> case MAC_HASHH:
>> return s->mac_hashh;
>> - break;
>> case MAC_HASHL:
>> return s->mac_hashl;
>> - break;
>> case MAC_MII_ACC:
>> return s->mac_mii_acc;
>> case MAC_MII_DATA:
>> diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c
>> index 7d6105e..0f1afd6 100644
>> --- a/hw/usb/ccid-card-emulated.c
>> +++ b/hw/usb/ccid-card-emulated.c
>> @@ -350,7 +350,6 @@ static void *event_thread(void *arg)
>> case VEVENT_LAST: /* quit */
>> vevent_delete(event);
>> return NULL;
>> - break;
>> default:
>> break;
>> }
>>
>
> Reviewed-by: Thomas Huth <th...@redhat.com>
>
>
Applied to my trivial-patches branch.
Thanks,
Laurent
