[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/10] hw/pci-host/sabre: Simplify code initializing variable once
From: |
Mark Cave-Ayland |
Subject: |
[PULL 10/10] hw/pci-host/sabre: Simplify code initializing variable once |
Date: |
Wed, 28 Oct 2020 08:23:58 +0000 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
We only need to zero-initialize 'val' once.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20201012170950.3491912-4-f4bug@amsat.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/pci-host/sabre.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/hw/pci-host/sabre.c b/hw/pci-host/sabre.c
index f678a3eefc..f41a0cc301 100644
--- a/hw/pci-host/sabre.c
+++ b/hw/pci-host/sabre.c
@@ -195,32 +195,25 @@ static uint64_t sabre_config_read(void *opaque,
hwaddr addr, unsigned size)
{
SabreState *s = opaque;
- uint32_t val;
+ uint32_t val = 0;
switch (addr) {
case 0x30 ... 0x4f: /* DMA error registers */
- val = 0;
/* XXX: not implemented yet */
break;
case 0xc00 ... 0xc3f: /* PCI interrupt control */
if (addr & 4) {
val = s->pci_irq_map[(addr & 0x3f) >> 3];
- } else {
- val = 0;
}
break;
case 0x1000 ... 0x107f: /* OBIO interrupt control */
if (addr & 4) {
val = s->obio_irq_map[(addr & 0xff) >> 3];
- } else {
- val = 0;
}
break;
case 0x1080 ... 0x108f: /* PCI bus error */
if (addr & 4) {
val = s->pci_err_irq_map[(addr & 0xf) >> 3];
- } else {
- val = 0;
}
break;
case 0x2000 ... 0x202f: /* PCI control */
@@ -229,8 +222,6 @@ static uint64_t sabre_config_read(void *opaque,
case 0xf020 ... 0xf027: /* Reset control */
if (addr & 4) {
val = s->reset_control;
- } else {
- val = 0;
}
break;
case 0x5000 ... 0x51cf: /* PIO/DMA diagnostics */
@@ -239,7 +230,6 @@ static uint64_t sabre_config_read(void *opaque,
case 0xf000 ... 0xf01f: /* FFB config, memory control */
/* we don't care */
default:
- val = 0;
break;
}
trace_sabre_config_read(addr, val);
--
2.20.1
- [PULL 00/10] qemu-sparc queue 20201028, Mark Cave-Ayland, 2020/10/28
- [PULL 01/10] sparc32-dma: use object_initialize_child() for espdma and ledma child objects, Mark Cave-Ayland, 2020/10/28
- [PULL 02/10] sparc32-ledma: use object_initialize_child() for lance child object, Mark Cave-Ayland, 2020/10/28
- [PULL 03/10] sparc32-espdma: use object_initialize_child() for esp child object, Mark Cave-Ayland, 2020/10/28
- [PULL 04/10] sparc32-ledma: don't reference nd_table directly within the device, Mark Cave-Ayland, 2020/10/28
- [PULL 05/10] sabre: don't call sysbus_mmio_map() in sabre_realize(), Mark Cave-Ayland, 2020/10/28
- [PULL 06/10] hw/display/tcx: Allow 64-bit accesses to framebuffer stippler and blitter, Mark Cave-Ayland, 2020/10/28
- [PULL 07/10] sabre: increase number of PCI bus IRQs from 32 to 64, Mark Cave-Ayland, 2020/10/28
- [PULL 08/10] hw/pci-host/sabre: Update documentation link, Mark Cave-Ayland, 2020/10/28
- [PULL 09/10] hw/pci-host/sabre: Remove superfluous address range check, Mark Cave-Ayland, 2020/10/28
- [PULL 10/10] hw/pci-host/sabre: Simplify code initializing variable once,
Mark Cave-Ayland <=
- Re: [PULL 00/10] qemu-sparc queue 20201028, Peter Maydell, 2020/10/31