Skip to content

Commit 1373b15

Browse files
philmdcminyard
philmd
authored and
cminyard
committed
hw/i2c: Rename i2c_create_slave() as i2c_slave_create_simple()
We use "create_simple" names for functions that allocate, initialize, configure and realize device objects: pci_create_simple(), isa_create_simple(), usb_create_simple(). For consistency, rename i2c_create_slave() as i2c_slave_create_simple(). Since we have to update all the callers, also let it return a I2CSlave object. Suggested-by: Markus Armbruster <[email protected]> Reviewed-by: Corey Minyard <[email protected]> Reviewed-by: Markus Armbruster <[email protected]> Signed-off-by: Philippe Mathieu-Daudé <[email protected]> Message-Id: <[email protected]> Signed-off-by: Corey Minyard <[email protected]>
1 parent 2616f57 commit 1373b15

File tree

16 files changed

+54
-53
lines changed

16 files changed

+54
-53
lines changed

‎hw/arm/aspeed.c‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -385,14 +385,14 @@ static void palmetto_bmc_i2c_init(AspeedMachineState *bmc)
385385

386386
/* The palmetto platform expects a ds3231 RTC but a ds1338 is
387387
* enough to provide basic RTC features. Alarms will be missing */
388-
i2c_create_slave(aspeed_i2c_get_bus(&soc->i2c, 0), "ds1338", 0x68);
388+
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 0), "ds1338", 0x68);
389389

390390
smbus_eeprom_init_one(aspeed_i2c_get_bus(&soc->i2c, 0), 0x50,
391391
eeprom_buf);
392392

393393
/* add a TMP423 temperature sensor */
394-
dev = i2c_create_slave(aspeed_i2c_get_bus(&soc->i2c, 2),
395-
"tmp423", 0x4c);
394+
dev = DEVICE(i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 2),
395+
"tmp423", 0x4c));
396396
object_property_set_int(OBJECT(dev), "temperature0", 31000, &error_abort);
397397
object_property_set_int(OBJECT(dev), "temperature1", 28000, &error_abort);
398398
object_property_set_int(OBJECT(dev), "temperature2", 20000, &error_abort);
@@ -408,12 +408,12 @@ static void ast2500_evb_i2c_init(AspeedMachineState *bmc)
408408
eeprom_buf);
409409

410410
/* The AST2500 EVB expects a LM75 but a TMP105 is compatible */
411-
i2c_create_slave(aspeed_i2c_get_bus(&soc->i2c, 7),
411+
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 7),
412412
TYPE_TMP105, 0x4d);
413413

414414
/* The AST2500 EVB does not have an RTC. Let's pretend that one is
415415
* plugged on the I2C bus header */
416-
i2c_create_slave(aspeed_i2c_get_bus(&soc->i2c, 11), "ds1338", 0x32);
416+
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 11), "ds1338", 0x32);
417417
}
418418

419419
static void ast2600_evb_i2c_init(AspeedMachineState *bmc)
@@ -428,45 +428,45 @@ static void romulus_bmc_i2c_init(AspeedMachineState *bmc)
428428

429429
/* The romulus board expects Epson RX8900 I2C RTC but a ds1338 is
430430
* good enough */
431-
i2c_create_slave(aspeed_i2c_get_bus(&soc->i2c, 11), "ds1338", 0x32);
431+
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 11), "ds1338", 0x32);
432432
}
433433

434434
static void swift_bmc_i2c_init(AspeedMachineState *bmc)
435435
{
436436
AspeedSoCState *soc = &bmc->soc;
437437

438-
i2c_create_slave(aspeed_i2c_get_bus(&soc->i2c, 3), "pca9552", 0x60);
438+
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 3), "pca9552", 0x60);
439439

440440
/* The swift board expects a TMP275 but a TMP105 is compatible */
441-
i2c_create_slave(aspeed_i2c_get_bus(&soc->i2c, 7), "tmp105", 0x48);
441+
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 7), "tmp105", 0x48);
442442
/* The swift board expects a pca9551 but a pca9552 is compatible */
443-
i2c_create_slave(aspeed_i2c_get_bus(&soc->i2c, 7), "pca9552", 0x60);
443+
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 7), "pca9552", 0x60);
444444

445445
/* The swift board expects an Epson RX8900 RTC but a ds1338 is compatible */
446-
i2c_create_slave(aspeed_i2c_get_bus(&soc->i2c, 8), "ds1338", 0x32);
447-
i2c_create_slave(aspeed_i2c_get_bus(&soc->i2c, 8), "pca9552", 0x60);
446+
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 8), "ds1338", 0x32);
447+
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 8), "pca9552", 0x60);
448448

449-
i2c_create_slave(aspeed_i2c_get_bus(&soc->i2c, 9), "tmp423", 0x4c);
449+
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 9), "tmp423", 0x4c);
450450
/* The swift board expects a pca9539 but a pca9552 is compatible */
451-
i2c_create_slave(aspeed_i2c_get_bus(&soc->i2c, 9), "pca9552", 0x74);
451+
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 9), "pca9552", 0x74);
452452

453-
i2c_create_slave(aspeed_i2c_get_bus(&soc->i2c, 10), "tmp423", 0x4c);
453+
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 10), "tmp423", 0x4c);
454454
/* The swift board expects a pca9539 but a pca9552 is compatible */
455-
i2c_create_slave(aspeed_i2c_get_bus(&soc->i2c, 10), "pca9552",
455+
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 10), "pca9552",
456456
0x74);
457457

458458
/* The swift board expects a TMP275 but a TMP105 is compatible */
459-
i2c_create_slave(aspeed_i2c_get_bus(&soc->i2c, 12), "tmp105", 0x48);
460-
i2c_create_slave(aspeed_i2c_get_bus(&soc->i2c, 12), "tmp105", 0x4a);
459+
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 12), "tmp105", 0x48);
460+
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 12), "tmp105", 0x4a);
461461
}
462462

463463
static void sonorapass_bmc_i2c_init(AspeedMachineState *bmc)
464464
{
465465
AspeedSoCState *soc = &bmc->soc;
466466

467467
/* bus 2 : */
468-
i2c_create_slave(aspeed_i2c_get_bus(&soc->i2c, 2), "tmp105", 0x48);
469-
i2c_create_slave(aspeed_i2c_get_bus(&soc->i2c, 2), "tmp105", 0x49);
468+
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 2), "tmp105", 0x48);
469+
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 2), "tmp105", 0x49);
470470
/* bus 2 : pca9546 @ 0x73 */
471471

472472
/* bus 3 : pca9548 @ 0x70 */
@@ -476,21 +476,21 @@ static void sonorapass_bmc_i2c_init(AspeedMachineState *bmc)
476476
smbus_eeprom_init_one(aspeed_i2c_get_bus(&soc->i2c, 4), 0x54,
477477
eeprom4_54);
478478
/* PCA9539 @ 0x76, but PCA9552 is compatible */
479-
i2c_create_slave(aspeed_i2c_get_bus(&soc->i2c, 4), "pca9552", 0x76);
479+
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 4), "pca9552", 0x76);
480480
/* PCA9539 @ 0x77, but PCA9552 is compatible */
481-
i2c_create_slave(aspeed_i2c_get_bus(&soc->i2c, 4), "pca9552", 0x77);
481+
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 4), "pca9552", 0x77);
482482

483483
/* bus 6 : */
484-
i2c_create_slave(aspeed_i2c_get_bus(&soc->i2c, 6), "tmp105", 0x48);
485-
i2c_create_slave(aspeed_i2c_get_bus(&soc->i2c, 6), "tmp105", 0x49);
484+
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 6), "tmp105", 0x48);
485+
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 6), "tmp105", 0x49);
486486
/* bus 6 : pca9546 @ 0x73 */
487487

488488
/* bus 8 : */
489489
uint8_t *eeprom8_56 = g_malloc0(8 * 1024);
490490
smbus_eeprom_init_one(aspeed_i2c_get_bus(&soc->i2c, 8), 0x56,
491491
eeprom8_56);
492-
i2c_create_slave(aspeed_i2c_get_bus(&soc->i2c, 8), "pca9552", 0x60);
493-
i2c_create_slave(aspeed_i2c_get_bus(&soc->i2c, 8), "pca9552", 0x61);
492+
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 8), "pca9552", 0x60);
493+
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 8), "pca9552", 0x61);
494494
/* bus 8 : adc128d818 @ 0x1d */
495495
/* bus 8 : adc128d818 @ 0x1f */
496496

@@ -519,16 +519,16 @@ static void witherspoon_bmc_i2c_init(AspeedMachineState *bmc)
519519
aspeed_i2c_get_bus(&soc->i2c, 3),
520520
&error_fatal);
521521

522-
i2c_create_slave(aspeed_i2c_get_bus(&soc->i2c, 4), "tmp423", 0x4c);
523-
i2c_create_slave(aspeed_i2c_get_bus(&soc->i2c, 5), "tmp423", 0x4c);
522+
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 4), "tmp423", 0x4c);
523+
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 5), "tmp423", 0x4c);
524524

525525
/* The Witherspoon expects a TMP275 but a TMP105 is compatible */
526-
i2c_create_slave(aspeed_i2c_get_bus(&soc->i2c, 9), TYPE_TMP105,
526+
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 9), TYPE_TMP105,
527527
0x4a);
528528

529529
/* The witherspoon board expects Epson RX8900 I2C RTC but a ds1338 is
530530
* good enough */
531-
i2c_create_slave(aspeed_i2c_get_bus(&soc->i2c, 11), "ds1338", 0x32);
531+
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 11), "ds1338", 0x32);
532532

533533
smbus_eeprom_init_one(aspeed_i2c_get_bus(&soc->i2c, 11), 0x51,
534534
eeprom_buf);

‎hw/arm/musicpal.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1584,7 +1584,7 @@ static void musicpal_init(MachineState *machine)
15841584
DeviceState *i2c_dev;
15851585
DeviceState *lcd_dev;
15861586
DeviceState *key_dev;
1587-
DeviceState *wm8750_dev;
1587+
I2CSlave *wm8750_dev;
15881588
SysBusDevice *s;
15891589
I2CBus *i2c;
15901590
int i;
@@ -1687,7 +1687,7 @@ static void musicpal_init(MachineState *machine)
16871687
qdev_connect_gpio_out(key_dev, i, qdev_get_gpio_in(dev, i + 15));
16881688
}
16891689

1690-
wm8750_dev = i2c_create_slave(i2c, TYPE_WM8750, MP_WM_ADDR);
1690+
wm8750_dev = i2c_slave_create_simple(i2c, TYPE_WM8750, MP_WM_ADDR);
16911691
dev = qdev_new(TYPE_MV88W8618_AUDIO);
16921692
s = SYS_BUS_DEVICE(dev);
16931693
object_property_set_link(OBJECT(dev), "wm8750", OBJECT(wm8750_dev),

‎hw/arm/nseries.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ static void n8x0_i2c_setup(struct n800_s *s)
215215
I2CBus *i2c = omap_i2c_bus(s->mpu->i2c[0]);
216216

217217
/* Attach a menelaus PM chip */
218-
dev = i2c_create_slave(i2c, "twl92230", N8X0_MENELAUS_ADDR);
218+
dev = DEVICE(i2c_slave_create_simple(i2c, "twl92230", N8X0_MENELAUS_ADDR));
219219
qdev_connect_gpio_out(dev, 3,
220220
qdev_get_gpio_in(s->mpu->ih[0],
221221
OMAP_INT_24XX_SYS_NIRQ));
@@ -224,7 +224,7 @@ static void n8x0_i2c_setup(struct n800_s *s)
224224
qemu_register_powerdown_notifier(&n8x0_system_powerdown_notifier);
225225

226226
/* Attach a TMP105 PM chip (A0 wired to ground) */
227-
dev = i2c_create_slave(i2c, TYPE_TMP105, N8X0_TMP105_ADDR);
227+
dev = DEVICE(i2c_slave_create_simple(i2c, TYPE_TMP105, N8X0_TMP105_ADDR));
228228
qdev_connect_gpio_out(dev, 0, tmp_irq);
229229
}
230230

@@ -416,8 +416,8 @@ static void n810_kbd_setup(struct n800_s *s)
416416

417417
/* Attach the LM8322 keyboard to the I2C bus,
418418
* should happen in n8x0_i2c_setup and s->kbd be initialised here. */
419-
s->kbd = i2c_create_slave(omap_i2c_bus(s->mpu->i2c[0]),
420-
"lm8323", N810_LM8323_ADDR);
419+
s->kbd = DEVICE(i2c_slave_create_simple(omap_i2c_bus(s->mpu->i2c[0]),
420+
"lm8323", N810_LM8323_ADDR));
421421
qdev_connect_gpio_out(s->kbd, 0, kbd_irq);
422422
}
423423

‎hw/arm/pxa2xx.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1522,8 +1522,9 @@ PXA2xxI2CState *pxa2xx_i2c_init(hwaddr base,
15221522
s = PXA2XX_I2C(i2c_dev);
15231523
/* FIXME: Should the slave device really be on a separate bus? */
15241524
i2cbus = i2c_init_bus(dev, "dummy");
1525-
dev = i2c_create_slave(i2cbus, TYPE_PXA2XX_I2C_SLAVE, 0);
1526-
s->slave = PXA2XX_I2C_SLAVE(dev);
1525+
s->slave = PXA2XX_I2C_SLAVE(i2c_slave_create_simple(i2cbus,
1526+
TYPE_PXA2XX_I2C_SLAVE,
1527+
0));
15271528
s->slave->host = s;
15281529

15291530
return s;

‎hw/arm/realview.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ static void realview_init(MachineState *machine,
285285

286286
dev = sysbus_create_simple(TYPE_VERSATILE_I2C, 0x10002000, NULL);
287287
i2c = (I2CBus *)qdev_get_child_bus(dev, "i2c");
288-
i2c_create_slave(i2c, "ds1338", 0x68);
288+
i2c_slave_create_simple(i2c, "ds1338", 0x68);
289289

290290
/* Memory map for RealView Emulation Baseboard: */
291291
/* 0x10000000 System registers. */

‎hw/arm/spitz.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ static void spitz_i2c_setup(PXA2xxState *cpu)
787787
DeviceState *wm;
788788

789789
/* Attach a WM8750 to the bus */
790-
wm = i2c_create_slave(bus, TYPE_WM8750, 0);
790+
wm = DEVICE(i2c_slave_create_simple(bus, TYPE_WM8750, 0));
791791

792792
spitz_wm8750_addr(wm, 0, 0);
793793
qdev_connect_gpio_out(cpu->gpio, SPITZ_GPIO_WM,
@@ -802,7 +802,7 @@ static void spitz_i2c_setup(PXA2xxState *cpu)
802802
static void spitz_akita_i2c_setup(PXA2xxState *cpu)
803803
{
804804
/* Attach a Max7310 to Akita I2C bus. */
805-
i2c_create_slave(pxa2xx_i2c_bus(cpu->i2c[0]), "max7310",
805+
i2c_slave_create_simple(pxa2xx_i2c_bus(cpu->i2c[0]), "max7310",
806806
AKITA_MAX_ADDR);
807807
}
808808

‎hw/arm/stellaris.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1380,7 +1380,7 @@ static void stellaris_init(MachineState *ms, stellaris_board_info *board)
13801380
qdev_get_gpio_in(nvic, 8));
13811381
i2c = (I2CBus *)qdev_get_child_bus(dev, "i2c");
13821382
if (board->peripherals & BP_OLED_I2C) {
1383-
i2c_create_slave(i2c, "ssd0303", 0x3d);
1383+
i2c_slave_create_simple(i2c, "ssd0303", 0x3d);
13841384
}
13851385
}
13861386

‎hw/arm/tosa.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ static uint8_t tosa_dac_recv(I2CSlave *s)
206206
static void tosa_tg_init(PXA2xxState *cpu)
207207
{
208208
I2CBus *bus = pxa2xx_i2c_bus(cpu->i2c[0]);
209-
i2c_create_slave(bus, TYPE_TOSA_DAC, DAC_BASE);
209+
i2c_slave_create_simple(bus, TYPE_TOSA_DAC, DAC_BASE);
210210
ssi_create_slave(cpu->ssp[1], "tosa-ssp");
211211
}
212212

‎hw/arm/versatilepb.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ static void versatile_init(MachineState *machine, int board_id)
317317

318318
dev = sysbus_create_simple(TYPE_VERSATILE_I2C, 0x10002000, NULL);
319319
i2c = (I2CBus *)qdev_get_child_bus(dev, "i2c");
320-
i2c_create_slave(i2c, "ds1338", 0x68);
320+
i2c_slave_create_simple(i2c, "ds1338", 0x68);
321321

322322
/* Add PL041 AACI Interface to the LM4549 codec */
323323
pl041 = qdev_new("pl041");

‎hw/arm/vexpress.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ static void vexpress_common_init(MachineState *machine)
642642

643643
dev = sysbus_create_simple(TYPE_VERSATILE_I2C, map[VE_SERIALDVI], NULL);
644644
i2c = (I2CBus *)qdev_get_child_bus(dev, "i2c");
645-
i2c_create_slave(i2c, "sii9022", 0x39);
645+
i2c_slave_create_simple(i2c, "sii9022", 0x39);
646646

647647
sysbus_create_simple("pl031", map[VE_RTC], pic[4]); /* RTC */
648648

0 commit comments

Comments
 (0)