From: David Woodhouse <David.Woodhouse@intel.com>
Date: Sat, 23 Feb 2013 00:40:38 +0000 (+0000)
Subject: piix_pci: Use DEVICE() and ISA_BUS()
X-Git-Tag: v1.5.0-rc0~386
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d93a8a435cbd7f874ef71d4da5677c5f88d8435a;p=thirdparty%2Fqemu.git

piix_pci: Use DEVICE() and ISA_BUS()

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Message-id: 1361580039-4459-3-git-send-email-dwmw2@infradead.org
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/hw/piix_pci.c b/hw/piix_pci.c
index c29eee0e6c3..1e05d499cd0 100644
--- a/hw/piix_pci.c
+++ b/hw/piix_pci.c
@@ -300,8 +300,7 @@ static PCIBus *i440fx_common_init(const char *device_name,
         pci_bus_set_route_irq_fn(b, piix3_route_intx_pin_to_irq);
     }
     piix3->pic = pic;
-    *isa_bus = DO_UPCAST(ISABus, qbus,
-                         qdev_get_child_bus(&piix3->dev.qdev, "isa.0"));
+    *isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(piix3), "isa.0"));
 
     *piix3_devfn = piix3->dev.devfn;
 
@@ -548,7 +547,7 @@ static int piix3_initfn(PCIDevice *dev)
 {
     PIIX3State *d = DO_UPCAST(PIIX3State, dev, dev);
 
-    isa_bus_new(&d->dev.qdev, pci_address_space_io(dev));
+    isa_bus_new(DEVICE(d), pci_address_space_io(dev));
 
     memory_region_init_io(&d->rcr_mem, &rcr_ops, d, "piix3-reset-control", 1);
     memory_region_add_subregion_overlap(pci_address_space_io(dev), RCR_IOPORT,