[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 25/43] hw/mips/malta: Reuse dev variable
From: |
Bernhard Beschow |
Subject: |
[PATCH v2 25/43] hw/mips/malta: Reuse dev variable |
Date: |
Sat, 22 Oct 2022 17:04:50 +0200 |
While at it, move the assignments closer to where they are used.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
hw/mips/malta.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index 0e932988e0..0ec2ac2eaf 100644
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -1239,7 +1239,6 @@ void mips_malta_init(MachineState *machine)
MaltaState *s;
PCIDevice *piix4;
DeviceState *dev;
- DeviceState *pm_dev;
s = MIPS_MALTA(qdev_new(TYPE_MIPS_MALTA));
sysbus_realize_and_unref(SYS_BUS_DEVICE(s), &error_fatal);
@@ -1405,13 +1404,13 @@ void mips_malta_init(MachineState *machine)
TYPE_PIIX4_PCI_DEVICE);
dev = DEVICE(piix4);
isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0"));
- pm_dev = DEVICE(object_resolve_path_component(OBJECT(dev), "pm"));
- smbus = I2C_BUS(qdev_get_child_bus(pm_dev, "i2c"));
/* Interrupt controller */
qdev_connect_gpio_out_named(dev, "intr", 0, i8259_irq);
/* generate SPD EEPROM data */
+ dev = DEVICE(object_resolve_path_component(OBJECT(piix4), "pm"));
+ smbus = I2C_BUS(qdev_get_child_bus(dev, "i2c"));
generate_eeprom_spd(&smbus_eeprom_buf[0 * 256], ram_size);
generate_eeprom_serial(&smbus_eeprom_buf[6 * 256]);
smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size);
--
2.38.1
- Re: [PATCH v2 19/43] hw/isa/piix3: Allow board to provide PCI interrupt routes, (continued)
- [PATCH v2 20/43] hw/isa/piix3: Resolve redundant PIIX_NUM_PIC_IRQS, Bernhard Beschow, 2022/10/22
- [PATCH v2 21/43] hw/isa/piix3: Rename pci_piix3_props for sharing with PIIX4, Bernhard Beschow, 2022/10/22
- [PATCH v2 22/43] hw/isa/piix3: Rename piix3_reset() for sharing with PIIX4, Bernhard Beschow, 2022/10/22
- [PATCH v2 23/43] hw/isa/piix3: Prefix pci_slot_get_pirq() with "piix3_", Bernhard Beschow, 2022/10/22
- [PATCH v2 24/43] hw/isa/piix3: Rename typedef PIIX3State to PIIXState, Bernhard Beschow, 2022/10/22
- [PATCH v2 25/43] hw/mips/malta: Reuse dev variable,
Bernhard Beschow <=
- [PATCH v2 26/43] meson: Fix dependencies of piix4 southbridge, Bernhard Beschow, 2022/10/22
- [PATCH v2 27/43] hw/isa/piix4: Add missing initialization, Bernhard Beschow, 2022/10/22
- [PATCH v2 28/43] hw/isa/piix4: Move pci_ide_create_devs() call to board code, Bernhard Beschow, 2022/10/22
- [PATCH v2 29/43] hw/isa/piix4: Make PIIX4's ACPI and USB functions optional, Bernhard Beschow, 2022/10/22
- [PATCH v2 30/43] hw/isa/piix4: Allow board to provide PCI interrupt routes, Bernhard Beschow, 2022/10/22
- [PATCH v2 31/43] hw/isa/piix4: Remove unused code, Bernhard Beschow, 2022/10/22
- [PATCH v2 32/43] hw/isa/piix4: Use ISA PIC device, Bernhard Beschow, 2022/10/22
- [PATCH v2 33/43] hw/isa/piix4: Reuse struct PIIXState from PIIX3, Bernhard Beschow, 2022/10/22
- [PATCH v2 34/43] hw/isa/piix4: Rename reset control operations to match PIIX3, Bernhard Beschow, 2022/10/22