hw/i2c/smbus_ich9: Inline ich9_smb_init() and remove it
ich9_smb_init() is a legacy init function, so modernize the code. Note that the smb_io_base parameter was unused. Signed-off-by: Bernhard Beschow <shentey@gmail.com> Acked-by: Corey Minyard <cminyard@mvista.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-Id: <20230213173033.98762-6-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
parent
d73c2b1c04
commit
07981e8fa0
@ -105,6 +105,9 @@ static void ich9_smbus_realize(PCIDevice *d, Error **errp)
|
||||
pm_smbus_init(&d->qdev, &s->smb, false);
|
||||
pci_register_bar(d, ICH9_SMB_SMB_BASE_BAR, PCI_BASE_ADDRESS_SPACE_IO,
|
||||
&s->smb.io);
|
||||
|
||||
s->smb.set_irq = ich9_smb_set_irq;
|
||||
s->smb.opaque = s;
|
||||
}
|
||||
|
||||
static void build_ich9_smb_aml(AcpiDevAmlIf *adev, Aml *scope)
|
||||
@ -137,16 +140,6 @@ static void ich9_smb_class_init(ObjectClass *klass, void *data)
|
||||
adevc->build_dev_aml = build_ich9_smb_aml;
|
||||
}
|
||||
|
||||
I2CBus *ich9_smb_init(PCIBus *bus, int devfn, uint32_t smb_io_base)
|
||||
{
|
||||
PCIDevice *d =
|
||||
pci_create_simple_multifunction(bus, devfn, true, TYPE_ICH9_SMB_DEVICE);
|
||||
ICH9SMBState *s = ICH9_SMB_DEVICE(d);
|
||||
s->smb.set_irq = ich9_smb_set_irq;
|
||||
s->smb.opaque = s;
|
||||
return s->smb.smbus;
|
||||
}
|
||||
|
||||
static const TypeInfo ich9_smb_info = {
|
||||
.name = TYPE_ICH9_SMB_DEVICE,
|
||||
.parent = TYPE_PCI_DEVICE,
|
||||
|
@ -315,10 +315,15 @@ static void pc_q35_init(MachineState *machine)
|
||||
}
|
||||
|
||||
if (pcms->smbus_enabled) {
|
||||
PCIDevice *smb;
|
||||
|
||||
/* TODO: Populate SPD eeprom data. */
|
||||
pcms->smbus = ich9_smb_init(host_bus,
|
||||
PCI_DEVFN(ICH9_SMB_DEV, ICH9_SMB_FUNC),
|
||||
0xb100);
|
||||
smb = pci_create_simple_multifunction(host_bus,
|
||||
PCI_DEVFN(ICH9_SMB_DEV,
|
||||
ICH9_SMB_FUNC),
|
||||
true, TYPE_ICH9_SMB_DEVICE);
|
||||
pcms->smbus = I2C_BUS(qdev_get_child_bus(DEVICE(smb), "i2c"));
|
||||
|
||||
smbus_eeprom_init(pcms->smbus, 8, NULL, 0);
|
||||
}
|
||||
|
||||
|
@ -9,7 +9,6 @@
|
||||
#include "qom/object.h"
|
||||
|
||||
void ich9_lpc_pm_init(PCIDevice *pci_lpc, bool smm_enabled);
|
||||
I2CBus *ich9_smb_init(PCIBus *bus, int devfn, uint32_t smb_io_base);
|
||||
|
||||
void ich9_generate_smi(void);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user