From 8aae84a1f2ad256d222c97411af17013b1c35799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 25 Jan 2013 09:12:54 +0100 Subject: i2c: Drop I2C_SLAVE_FROM_QDEV() macro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is not being used in hot paths and is obsoleted by I2C_SLAVE() QOM cast macro. Clean it up using a scripted conversion, so that it doesn't get used in new code. Some of its callers were combining it with FROM_I2C_SLAVE() macro, which is equally obsolete but needs to be replaced in a type-specific way. Signed-off-by: Andreas Färber Cc: Kuo-Jung Su Signed-off-by: Anthony Liguori --- hw/max7310.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw/max7310.c') diff --git a/hw/max7310.c b/hw/max7310.c index de2221ba01..c2df0b49eb 100644 --- a/hw/max7310.c +++ b/hw/max7310.c @@ -25,7 +25,7 @@ typedef struct { static void max7310_reset(DeviceState *dev) { - MAX7310State *s = FROM_I2C_SLAVE(MAX7310State, I2C_SLAVE_FROM_QDEV(dev)); + MAX7310State *s = FROM_I2C_SLAVE(MAX7310State, I2C_SLAVE(dev)); s->level &= s->direction; s->direction = 0xff; s->polarity = 0xf0; -- cgit v1.2.3