Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging

[qemu.git] / hw / display / ads7846.c

diff --git a/hw/display/ads7846.c b/hw/display/ads7846.c
index 5da3dc5b2cf7914ea5b3664baa72072f555d7e19..85252a23298784d3713d55ae1ea04e0b64904f5c 100644 (file)
--- a/hw/display/ads7846.c
+++ b/hw/display/ads7846.c
@@ -133,11 +133,12 @@ static const VMStateDescription vmstate_ads7846 = {
     }
 };
 
-static int ads7846_init(SSISlave *dev)
+static int ads7846_init(SSISlave *d)
 {
-    ADS7846State *s = FROM_SSI_SLAVE(ADS7846State, dev);
+    DeviceState *dev = DEVICE(d);
+    ADS7846State *s = FROM_SSI_SLAVE(ADS7846State, d);
 
-    qdev_init_gpio_out(&dev->qdev, &s->interrupt, 1);
+    qdev_init_gpio_out(dev, &s->interrupt, 1);
 
     s->input[0] = ADS_TEMP0;   /* TEMP0 */
     s->input[2] = ADS_VBAT;    /* VBAT */