Commit 19473e51 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Paolo Bonzini
Browse files

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



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

Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180419212727.26095-2-f4bug@amsat.org>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20180528144509.15812-2-armbru@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 244e2ad0

hw/i2c/smbus.c

+0 −9
Original line number Diff line number Diff line
@@ -202,14 +202,6 @@ static int smbus_i2c_send(I2CSlave *s, uint8_t data) 
    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.  */

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);



    sc->init = smbus_device_init;

    sc->event = smbus_i2c_event;

    sc->recv = smbus_i2c_recv;

    sc->send = smbus_i2c_send;

hw/i2c/smbus_eeprom.c

+2 −3
Original line number Diff line number Diff line
@@ -97,12 +97,11 @@ static uint8_t eeprom_read_data(SMBusDevice *dev, uint8_t cmd, int n) 
    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;



    eeprom->offset = 0;

    return 0;

}



static Property smbus_eeprom_properties[] = {
@@ -115,7 +114,7 @@ static void smbus_eeprom_class_initfn(ObjectClass *klass, void *data) 
    DeviceClass *dc = 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->send_byte = eeprom_send_byte;

    sc->receive_byte = eeprom_receive_byte;

include/hw/i2c/smbus.h

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
typedef struct SMBusDeviceClass

{

    I2CSlaveClass parent_class;

    int (*init)(SMBusDevice *dev);

    void (*quick_cmd)(SMBusDevice *dev, uint8_t read);

    void (*send_byte)(SMBusDevice *dev, uint8_t val);

    uint8_t (*receive_byte)(SMBusDevice *dev);