summaryrefslogtreecommitdiffstats
path: root/hw/xio3130_upstream.c
diff options
context:
space:
mode:
authorAlex Williamson <alex.williamson@redhat.com>2012-07-03 22:39:27 -0600
committerMichael S. Tsirkin <mst@redhat.com>2012-07-04 15:52:55 +0300
commitf90c2bcdbc69e41e575f868b984c3e2de8f51bac (patch)
tree1955dd08ce0a5e42ef1079ee292a4e5d95073776 /hw/xio3130_upstream.c
parent572992eefa74bfb92c24a28bd268de91a9311b0f (diff)
downloadhqemu-f90c2bcdbc69e41e575f868b984c3e2de8f51bac.zip
hqemu-f90c2bcdbc69e41e575f868b984c3e2de8f51bac.tar.gz
pci: convert PCIUnregisterFunc to void
Not a single driver has any possibility of failure on their exit function, let's keep it that way. Signed-off-by: Alex Williamson <alex.williamson@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/xio3130_upstream.c')
-rw-r--r--hw/xio3130_upstream.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/hw/xio3130_upstream.c b/hw/xio3130_upstream.c
index 7972581..d46b86c 100644
--- a/hw/xio3130_upstream.c
+++ b/hw/xio3130_upstream.c
@@ -56,7 +56,6 @@ static int xio3130_upstream_initfn(PCIDevice *d)
PCIBridge* br = DO_UPCAST(PCIBridge, dev, d);
PCIEPort *p = DO_UPCAST(PCIEPort, br, br);
int rc;
- int tmp;
rc = pci_bridge_initfn(d);
if (rc < 0) {
@@ -95,17 +94,16 @@ err:
err_msi:
msi_uninit(d);
err_bridge:
- tmp = pci_bridge_exitfn(d);
- assert(!tmp);
+ pci_bridge_exitfn(d);
return rc;
}
-static int xio3130_upstream_exitfn(PCIDevice *d)
+static void xio3130_upstream_exitfn(PCIDevice *d)
{
pcie_aer_exit(d);
pcie_cap_exit(d);
msi_uninit(d);
- return pci_bridge_exitfn(d);
+ pci_bridge_exitfn(d);
}
PCIEPort *xio3130_upstream_init(PCIBus *bus, int devfn, bool multifunction,
OpenPOWER on IntegriCloud