Merge branch 'msm-fixes-3.19' of git://people.freedesktop.org/~robclark/linux into...

[karo-tx-linux.git] / drivers / pci / hotplug / sgi_hotplug.c

diff --git a/drivers/pci/hotplug/sgi_hotplug.c b/drivers/pci/hotplug/sgi_hotplug.c
index 613043f7576f302c75bb5727d4dff910dd0aaaf2..bada209998705732e488a9e5e4dbb0139a43ad90 100644 (file)
--- a/drivers/pci/hotplug/sgi_hotplug.c
+++ b/drivers/pci/hotplug/sgi_hotplug.c
@@ -188,7 +188,7 @@ static int sn_hp_slot_private_alloc(struct hotplug_slot *bss_hotplug_slot,
        return 0;
 }
 
-static struct hotplug_slot * sn_hp_destroy(void)
+static struct hotplug_slot *sn_hp_destroy(void)
 {
        struct slot *slot;
        struct pci_slot *pci_slot;
@@ -250,15 +250,13 @@ static int sn_slot_enable(struct hotplug_slot *bss_hotplug_slot,
        }
 
        if (rc == PCI_L1_ERR) {
-               dev_dbg(&slot->pci_bus->self->dev,
-                       "L1 failure %d with message: %s",
+               dev_dbg(&slot->pci_bus->self->dev, "L1 failure %d with message: %s",
                        resp.resp_sub_errno, resp.resp_l1_msg);
                return -EPERM;
        }
 
        if (rc) {
-               dev_dbg(&slot->pci_bus->self->dev,
-                       "insert failed with error %d sub-error %d\n",
+               dev_dbg(&slot->pci_bus->self->dev, "insert failed with error %d sub-error %d\n",
                        rc, resp.resp_sub_errno);
                return -EIO;
        }
@@ -288,21 +286,18 @@ static int sn_slot_disable(struct hotplug_slot *bss_hotplug_slot,
        }
 
        if ((action == PCI_REQ_SLOT_ELIGIBLE) && (rc == PCI_EMPTY_33MHZ)) {
-               dev_dbg(&slot->pci_bus->self->dev,
-                       "Cannot remove last 33MHz card\n");
+               dev_dbg(&slot->pci_bus->self->dev, "Cannot remove last 33MHz card\n");
                return -EPERM;
        }
 
        if ((action == PCI_REQ_SLOT_ELIGIBLE) && (rc == PCI_L1_ERR)) {
-               dev_dbg(&slot->pci_bus->self->dev,
-                       "L1 failure %d with message \n%s\n",
+               dev_dbg(&slot->pci_bus->self->dev, "L1 failure %d with message \n%s\n",
                        resp.resp_sub_errno, resp.resp_l1_msg);
                return -EPERM;
        }
 
        if ((action == PCI_REQ_SLOT_ELIGIBLE) && rc) {
-               dev_dbg(&slot->pci_bus->self->dev,
-                       "remove failed with error %d sub-error %d\n",
+               dev_dbg(&slot->pci_bus->self->dev, "remove failed with error %d sub-error %d\n",
                        rc, resp.resp_sub_errno);
                return -EIO;
        }
@@ -417,8 +412,7 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
                phandle = acpi_device_handle(PCI_CONTROLLER(slot->pci_bus)->companion);
 
                if (acpi_bus_get_device(phandle, &pdevice)) {
-                       dev_dbg(&slot->pci_bus->self->dev,
-                               "no parent device, assuming NULL\n");
+                       dev_dbg(&slot->pci_bus->self->dev, "no parent device, assuming NULL\n");
                        pdevice = NULL;
                }
 
@@ -447,10 +441,8 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
 
                                ret = acpi_bus_scan(chandle);
                                if (ACPI_FAILURE(ret)) {
-                                       printk(KERN_ERR "%s: acpi_bus_scan "
-                                              "failed (0x%x) for slot %d "
-                                              "func %d\n", __func__,
-                                              ret, (int)(adr>>16),
+                                       printk(KERN_ERR "%s: acpi_bus_scan failed (0x%x) for slot %d func %d\n",
+                                              __func__, ret, (int)(adr>>16),
                                               (int)(adr&0xffff));
                                        /* try to continue on */
                                }
@@ -471,11 +463,9 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
        mutex_unlock(&sn_hotplug_mutex);
 
        if (rc == 0)
-               dev_dbg(&slot->pci_bus->self->dev,
-                       "insert operation successful\n");
+               dev_dbg(&slot->pci_bus->self->dev, "insert operation successful\n");
        else
-               dev_dbg(&slot->pci_bus->self->dev,
-                       "insert operation failed rc = %d\n", rc);
+               dev_dbg(&slot->pci_bus->self->dev, "insert operation failed rc = %d\n", rc);
 
        return rc;
 }
@@ -561,8 +551,7 @@ static int disable_slot(struct hotplug_slot *bss_hotplug_slot)
                acpi_status ret;
                ret = acpi_unload_table_id(ssdt_id);
                if (ACPI_FAILURE(ret)) {
-                       printk(KERN_ERR "%s: acpi_unload_table_id "
-                              "failed (0x%x) for id %d\n",
+                       printk(KERN_ERR "%s: acpi_unload_table_id failed (0x%x) for id %d\n",
                               __func__, ret, ssdt_id);
                        /* try to continue on */
                }