From 9e41bade85ef338afd983c109368d1bbbe931f80 Mon Sep 17 00:00:00 2001 From: Alastair D'Silva Date: Tue, 27 Dec 2016 14:59:29 +0000 Subject: hw/i2c: Add a NULL check for i2c slave init callbacks Add a NULL check for i2c slave init callbacks, so that we no longer need to implement empty init functions. Signed-off-by: Alastair D'Silva Message-id: 20161202054617.6749-4-alastair@au1.ibm.com Reviewed-by: Peter Maydell [PMM: squashed in later tweak from Alistair to if() phrasing] Signed-off-by: Peter Maydell --- hw/arm/tosa.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'hw/arm/tosa.c') diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c index 1ee12f49b3..39d9dbbae6 100644 --- a/hw/arm/tosa.c +++ b/hw/arm/tosa.c @@ -202,12 +202,6 @@ static int tosa_dac_recv(I2CSlave *s) return -1; } -static int tosa_dac_init(I2CSlave *i2c) -{ - /* Nothing to do. */ - return 0; -} - static void tosa_tg_init(PXA2xxState *cpu) { I2CBus *bus = pxa2xx_i2c_bus(cpu->i2c[0]); @@ -275,7 +269,6 @@ static void tosa_dac_class_init(ObjectClass *klass, void *data) { I2CSlaveClass *k = I2C_SLAVE_CLASS(klass); - k->init = tosa_dac_init; k->event = tosa_dac_event; k->recv = tosa_dac_recv; k->send = tosa_dac_send; -- cgit v1.2.3