motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-08 02:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/i2c/smbus: Use DeviceClass::realize instead of SMBusDeviceClass::init

Browse source 
SMBusDeviceClass::init is no more used, remove it.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180419212727.26095-2-f4bug@amsat.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20180528144509.15812-2-armbru@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2018-05-28 16:45:06 +02:00 • committed by Paolo Bonzini
parent 244e2ad0dc
commit 19473e51cc
3 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
hw/i2c/smbus.c
View file

@ -202,14 +202,6 @@ static int smbus_i2c_send(I2CSlave *s, uint8_t data)
return 0; return 0;
} }
static int smbus_device_init(I2CSlave *i2c)
{
SMBusDevice *dev = SMBUS_DEVICE(i2c);
SMBusDeviceClass *sc = SMBUS_DEVICE_GET_CLASS(dev);
return sc->init(dev);
}
/* Master device commands. */ /* Master device commands. */
int smbus_quick_command(I2CBus *bus, uint8_t addr, int read) int smbus_quick_command(I2CBus *bus, uint8_t addr, int read)
{ {
@ -350,7 +342,6 @@ static void smbus_device_class_init(ObjectClass *klass, void *data)
{ {
I2CSlaveClass *sc = I2C_SLAVE_CLASS(klass); I2CSlaveClass *sc = I2C_SLAVE_CLASS(klass);
sc->init = smbus_device_init;
sc->event = smbus_i2c_event; sc->event = smbus_i2c_event;
sc->recv = smbus_i2c_recv; sc->recv = smbus_i2c_recv;
sc->send = smbus_i2c_send; sc->send = smbus_i2c_send;

5
hw/i2c/smbus_eeprom.c
View file

@ -97,12 +97,11 @@ static uint8_t eeprom_read_data(SMBusDevice *dev, uint8_t cmd, int n)
return eeprom_receive_byte(dev); return eeprom_receive_byte(dev);
} }
static int smbus_eeprom_initfn(SMBusDevice *dev) static void smbus_eeprom_realize(DeviceState *dev, Error **errp)
{ {
SMBusEEPROMDevice *eeprom = (SMBusEEPROMDevice *)dev; SMBusEEPROMDevice *eeprom = (SMBusEEPROMDevice *)dev;
eeprom->offset = 0; eeprom->offset = 0;
return 0;
} }
static Property smbus_eeprom_properties[] = { static Property smbus_eeprom_properties[] = {
@ -115,7 +114,7 @@ static void smbus_eeprom_class_initfn(ObjectClass *klass, void *data)
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
SMBusDeviceClass *sc = SMBUS_DEVICE_CLASS(klass); SMBusDeviceClass *sc = SMBUS_DEVICE_CLASS(klass);
sc->init = smbus_eeprom_initfn; dc->realize = smbus_eeprom_realize;
sc->quick_cmd = eeprom_quick_cmd; sc->quick_cmd = eeprom_quick_cmd;
sc->send_byte = eeprom_send_byte; sc->send_byte = eeprom_send_byte;
sc->receive_byte = eeprom_receive_byte; sc->receive_byte = eeprom_receive_byte;

1
include/hw/i2c/smbus.h
View file

@ -38,7 +38,6 @@
typedef struct SMBusDeviceClass typedef struct SMBusDeviceClass
{ {
I2CSlaveClass parent_class; I2CSlaveClass parent_class;
int (*init)(SMBusDevice *dev);
void (*quick_cmd)(SMBusDevice *dev, uint8_t read); void (*quick_cmd)(SMBusDevice *dev, uint8_t read);
void (*send_byte)(SMBusDevice *dev, uint8_t val); void (*send_byte)(SMBusDevice *dev, uint8_t val);
uint8_t (*receive_byte)(SMBusDevice *dev); uint8_t (*receive_byte)(SMBusDevice *dev);