sparc64: Fix build errors with gcc-4.6.0

[linux-flexiantxendom0-natty.git] / arch / sparc / kernel / pci_common.c

diff --git a/arch/sparc/kernel/pci_common.c b/arch/sparc/kernel/pci_common.c
index 6c7a33a..6e3874b 100644 (file)
--- a/arch/sparc/kernel/pci_common.c
+++ b/arch/sparc/kernel/pci_common.c
@@ -295,14 +295,17 @@ static int sun4v_write_pci_cfg(struct pci_bus *bus_dev, unsigned int devfn,
        unsigned int bus = bus_dev->number;
        unsigned int device = PCI_SLOT(devfn);
        unsigned int func = PCI_FUNC(devfn);
-       unsigned long ret;
 
        if (config_out_of_range(pbm, bus, devfn, where)) {
                /* Do nothing. */
        } else {
-               ret = pci_sun4v_config_put(devhandle,
-                               HV_PCI_DEVICE_BUILD(bus, device, func),
-                               where, size, value);
+               /* We don't check for hypervisor errors here, but perhaps
+                * we should and influence our return value depending upon
+                * what kind of error is thrown.
+                */
+               pci_sun4v_config_put(devhandle,
+                                    HV_PCI_DEVICE_BUILD(bus, device, func),
+                                    where, size, value);
        }
        return PCIBIOS_SUCCESSFUL;
 }