Merge branch pci into master

[qemu.git] / hw / lsi53c895a.c

diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c
index 2fe141d24eab3a6bbd5a31c7d327e3951257a836..2544aacc40ad9357487ef9c93e1e1a1df5db499b 100644 (file)
--- a/hw/lsi53c895a.c
+++ b/hw/lsi53c895a.c
@@ -2071,15 +2071,13 @@ static const VMStateDescription vmstate_lsi_scsi = {
     }
 };
 
-static int lsi_scsi_uninit(PCIDevice *d)
+static void lsi_scsi_uninit(PCIDevice *d)
 {
     LSIState *s = DO_UPCAST(LSIState, dev, d);
 
     memory_region_destroy(&s->mmio_io);
     memory_region_destroy(&s->ram_io);
     memory_region_destroy(&s->io_io);
-
-    return 0;
 }
 
 static const struct SCSIBusInfo lsi_scsi_info = {