Commit 2616f572 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Corey Minyard
Browse files

hw/i2c: Rename i2c_realize_and_unref() as i2c_slave_realize_and_unref() 



The other i2c functions are called i2c_slave_FOO(). Rename as
i2c_slave_realize_and_unref() to be consistent.

Suggested-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarCorey Minyard <cminyard@mvista.com>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200705224154.16917-4-f4bug@amsat.org>
Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
parent db437ca6

hw/arm/aspeed.c

+6 −4
Original line number Diff line number Diff line
@@ -515,7 +515,8 @@ static void witherspoon_bmc_i2c_init(AspeedMachineState *bmc) 
    /* Bus 3: TODO dps310@76 */

    dev = DEVICE(i2c_slave_new(TYPE_PCA9552, 0x60));

    qdev_prop_set_string(dev, "description", "pca1");

    i2c_realize_and_unref(dev, aspeed_i2c_get_bus(&soc->i2c, 3),

    i2c_slave_realize_and_unref(I2C_SLAVE(dev),

                                aspeed_i2c_get_bus(&soc->i2c, 3),

                                &error_fatal);



    i2c_create_slave(aspeed_i2c_get_bus(&soc->i2c, 4), "tmp423", 0x4c);
@@ -533,7 +534,8 @@ static void witherspoon_bmc_i2c_init(AspeedMachineState *bmc) 
                          eeprom_buf);

    dev = DEVICE(i2c_slave_new(TYPE_PCA9552, 0x60));

    qdev_prop_set_string(dev, "description", "pca0");

    i2c_realize_and_unref(dev, aspeed_i2c_get_bus(&soc->i2c, 11),

    i2c_slave_realize_and_unref(I2C_SLAVE(dev),

                                aspeed_i2c_get_bus(&soc->i2c, 11),

                                &error_fatal);

    /* Bus 11: TODO ucd90160@64 */

}

hw/i2c/core.c

+3 −3
Original line number Diff line number Diff line
@@ -276,16 +276,16 @@ I2CSlave *i2c_slave_new(const char *name, uint8_t addr) 
    return I2C_SLAVE(dev);

}



bool i2c_realize_and_unref(DeviceState *dev, I2CBus *bus, Error **errp)

bool i2c_slave_realize_and_unref(I2CSlave *dev, I2CBus *bus, Error **errp)

{

    return qdev_realize_and_unref(dev, &bus->qbus, errp);

    return qdev_realize_and_unref(&dev->qdev, &bus->qbus, errp);

}



DeviceState *i2c_create_slave(I2CBus *bus, const char *name, uint8_t addr)

{

    I2CSlave *dev = i2c_slave_new(name, addr);



    i2c_realize_and_unref(DEVICE(dev), bus, &error_fatal);

    i2c_slave_realize_and_unref(dev, bus, &error_fatal);



    return DEVICE(dev);

}

include/hw/i2c/i2c.h

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ uint8_t i2c_recv(I2CBus *bus); 


I2CSlave *i2c_slave_new(const char *name, uint8_t addr);

DeviceState *i2c_create_slave(I2CBus *bus, const char *name, uint8_t addr);

bool i2c_realize_and_unref(DeviceState *dev, I2CBus *bus, Error **errp);

bool i2c_slave_realize_and_unref(I2CSlave *dev, I2CBus *bus, Error **errp);



/* lm832x.c */

void lm832x_key_event(DeviceState *dev, int key, int state);