mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw: Remove superfluous breaks

Browse Source 
Remove superfluous breaks, as there is a "return" before them.

Signed-off-by: Liao Pingfang <liao.pingfang@zte.com.cn>
Signed-off-by: Yi Wang <wang.yi59@zte.com.cn>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <1594631126-36631-1-git-send-email-wang.yi59@zte.com.cn>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Liao Pingfang 2020-07-13 17:05:26 +08:00 committed by Laurent Vivier
parent f181ab4ba5
commit 830b925094
9 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/block/pflash_cfi01.c
View File

@ -213,7 +213,6 @@ static uint32_t pflash_devid_query(PFlashCFI01 *pfl, hwaddr offset)
default: default:
trace_pflash_device_info(offset); trace_pflash_device_info(offset);
return 0; return 0;
break;
} }
/* Replicate responses for each device in bank. */ /* Replicate responses for each device in bank. */
if (pfl->device_width < pfl->bank_width) { if (pfl->device_width < pfl->bank_width) {

1
hw/display/cirrus_vga.c
View File

@ -1637,7 +1637,6 @@ static int cirrus_vga_read_cr(CirrusVGAState * s, unsigned reg_index)
return s->vga.cr[s->vga.cr_index]; return s->vga.cr[s->vga.cr_index];
case 0x26: // Attribute Controller Index Readback (R) case 0x26: // Attribute Controller Index Readback (R)
return s->vga.ar_index & 0x3f; return s->vga.ar_index & 0x3f;
break;
default: default:
qemu_log_mask(LOG_GUEST_ERROR, qemu_log_mask(LOG_GUEST_ERROR,
"cirrus: inport cr_index 0x%02x\n", reg_index); "cirrus: inport cr_index 0x%02x\n", reg_index);

2
hw/display/qxl-logger.c
View File

@ -161,7 +161,6 @@ static int qxl_log_cmd_draw(PCIQXLDevice *qxl, QXLDrawable *draw, int group_id)
switch (draw->type) { switch (draw->type) {
case QXL_DRAW_COPY: case QXL_DRAW_COPY:
return qxl_log_cmd_draw_copy(qxl, &draw->u.copy, group_id); return qxl_log_cmd_draw_copy(qxl, &draw->u.copy, group_id);
break;
} }
return 0; return 0;
} }
@ -180,7 +179,6 @@ static int qxl_log_cmd_draw_compat(PCIQXLDevice *qxl, QXLCompatDrawable *draw,
switch (draw->type) { switch (draw->type) {
case QXL_DRAW_COPY: case QXL_DRAW_COPY:
return qxl_log_cmd_draw_copy(qxl, &draw->u.copy, group_id); return qxl_log_cmd_draw_copy(qxl, &draw->u.copy, group_id);
break;
} }
return 0; return 0;
} }

3
hw/gpio/max7310.c
View File

@ -51,11 +51,9 @@ static uint8_t max7310_rx(I2CSlave *i2c)
switch (s->command) { switch (s->command) {
case 0x00: /* Input port */ case 0x00: /* Input port */
return s->level ^ s->polarity; return s->level ^ s->polarity;
break;
case 0x01: /* Output port */ case 0x01: /* Output port */
return s->level & ~s->direction; return s->level & ~s->direction;
break;
case 0x02: /* Polarity inversion */ case 0x02: /* Polarity inversion */
return s->polarity; return s->polarity;
@ -65,7 +63,6 @@ static uint8_t max7310_rx(I2CSlave *i2c)
case 0x04: /* Timeout */ case 0x04: /* Timeout */
return s->status; return s->status;
break;
case 0xff: /* Reserved */ case 0xff: /* Reserved */
return 0xff; return 0xff;

1
hw/i386/intel_iommu.c
View File

@ -3168,7 +3168,6 @@ static int vtd_irte_get(IntelIOMMUState *iommu, uint16_t index,
index, entry->irte.sid_vtype); index, entry->irte.sid_vtype);
/* Take this as verification failure. */ /* Take this as verification failure. */
return -VTD_FR_IR_SID_ERR; return -VTD_FR_IR_SID_ERR;
break;
} }
} }

10
hw/input/pxa2xx_keypad.c
View File

@ -192,10 +192,8 @@ static uint64_t pxa2xx_keypad_read(void *opaque, hwaddr offset,
s->kpc &= ~(KPC_DI); s->kpc &= ~(KPC_DI);
qemu_irq_lower(s->irq); qemu_irq_lower(s->irq);
return tmp; return tmp;
break;
case KPDK: case KPDK:
return s->kpdk; return s->kpdk;
break;
case KPREC: case KPREC:
tmp = s->kprec; tmp = s->kprec;
if(tmp & KPREC_OF1) if(tmp & KPREC_OF1)
@ -207,31 +205,23 @@ static uint64_t pxa2xx_keypad_read(void *opaque, hwaddr offset,
if(tmp & KPREC_UF0) if(tmp & KPREC_UF0)
s->kprec &= ~(KPREC_UF0); s->kprec &= ~(KPREC_UF0);
return tmp; return tmp;
break;
case KPMK: case KPMK:
tmp = s->kpmk; tmp = s->kpmk;
if(tmp & KPMK_MKP) if(tmp & KPMK_MKP)
s->kpmk &= ~(KPMK_MKP); s->kpmk &= ~(KPMK_MKP);
return tmp; return tmp;
break;
case KPAS: case KPAS:
return s->kpas; return s->kpas;
break;
case KPASMKP0: case KPASMKP0:
return s->kpasmkp[0]; return s->kpasmkp[0];
break;
case KPASMKP1: case KPASMKP1:
return s->kpasmkp[1]; return s->kpasmkp[1];
break;
case KPASMKP2: case KPASMKP2:
return s->kpasmkp[2]; return s->kpasmkp[2];
break;
case KPASMKP3: case KPASMKP3:
return s->kpasmkp[3]; return s->kpasmkp[3];
break;
case KPKDI: case KPKDI:
return s->kpkdi; return s->kpkdi;
break;
default: default:
qemu_log_mask(LOG_GUEST_ERROR, qemu_log_mask(LOG_GUEST_ERROR,
"%s: Bad read offset 0x%"HWADDR_PRIx"\n", "%s: Bad read offset 0x%"HWADDR_PRIx"\n",

1
hw/intc/armv7m_nvic.c
View File

@ -1290,7 +1290,6 @@ static uint32_t nvic_readl(NVICState *s, uint32_t offset, MemTxAttrs attrs)
case 0xd90: /* MPU_TYPE */ case 0xd90: /* MPU_TYPE */
/* Unified MPU; if the MPU is not present this value is zero */ /* Unified MPU; if the MPU is not present this value is zero */
return cpu->pmsav7_dregion << 8; return cpu->pmsav7_dregion << 8;
break;
case 0xd94: /* MPU_CTRL */ case 0xd94: /* MPU_CTRL */
return cpu->env.v7m.mpu_ctrl[attrs.secure]; return cpu->env.v7m.mpu_ctrl[attrs.secure];
case 0xd98: /* MPU_RNR */ case 0xd98: /* MPU_RNR */

2
hw/net/lan9118.c
View File

@ -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); | (s->conf.macaddr.a[2] << 16) | (s->conf.macaddr.a[3] << 24);
case MAC_HASHH: case MAC_HASHH:
return s->mac_hashh; return s->mac_hashh;
break;
case MAC_HASHL: case MAC_HASHL:
return s->mac_hashl; return s->mac_hashl;
break;
case MAC_MII_ACC: case MAC_MII_ACC:
return s->mac_mii_acc; return s->mac_mii_acc;
case MAC_MII_DATA: case MAC_MII_DATA:

1
hw/usb/ccid-card-emulated.c
View File

@ -350,7 +350,6 @@ static void *event_thread(void *arg)
case VEVENT_LAST: /* quit */ case VEVENT_LAST: /* quit */
vevent_delete(event); vevent_delete(event);
return NULL; return NULL;
break;
default: default:
break; break;
} }