5 files changed, 78 insertions, 88 deletions

diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index a4817a841fae..b2801a7ee37f 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -188,7 +188,7 @@ static inline struct slot *pciehp_find_slot(struct controller *ctrl, u8 device)
                         return slot;
         }
 
-        ctrl_err(ctrl, "%s: slot (device=0x%x) not found\n", __func__, device);
+        ctrl_err(ctrl, "Slot (device=0x%02x) not found\n", device);
         return NULL;
 }
 
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index 62be1b59c74b..4b23bc39b11e 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -184,7 +184,7 @@ static void release_slot(struct hotplug_slot *hotplug_slot)
 {
         struct slot *slot = hotplug_slot->private;
 
-        ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n",
+        ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
                  __func__, hotplug_slot_name(hotplug_slot));
 
         kfree(hotplug_slot->info);
@@ -216,9 +216,11 @@ static int init_slots(struct controller *ctrl)
                 slot->hotplug_slot = hotplug_slot;
                 snprintf(name, SLOT_NAME_SIZE, "%u", slot->number);
 
-                ctrl_dbg(ctrl, "Registering bus=%x dev=%x hp_slot=%x sun=%x "
-                         "slot_device_offset=%x\n", slot->bus, slot->device,
-                         slot->hp_slot, slot->number, ctrl->slot_device_offset);
+                ctrl_dbg(ctrl, "Registering domain:bus:dev=%04x:%02x:%02x "
+                         "hp_slot=%x sun=%x slot_device_offset=%x\n",
+                         pci_domain_nr(ctrl->pci_dev->subordinate),
+                         slot->bus, slot->device, slot->hp_slot, slot->number,
+                         ctrl->slot_device_offset);
                 retval = pci_hp_register(hotplug_slot,
                                          ctrl->pci_dev->subordinate,
                                          slot->device,
@@ -238,7 +240,7 @@ static int init_slots(struct controller *ctrl)
                                 &hotplug_slot_attr_lock.attr);
                         if (retval) {
                                 pci_hp_deregister(hotplug_slot);
-                                ctrl_err(ctrl, "cannot create additional sysfs "
+                                ctrl_err(ctrl, "Cannot create additional sysfs "
                                          "entries\n");
                                 goto error_info;
                         }
@@ -273,7 +275,7 @@ static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 status)
 {
         struct slot *slot = hotplug_slot->private;
 
-        ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n",
+        ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
                   __func__, slot_name(slot));
 
         hotplug_slot->info->attention_status = status;
@@ -289,7 +291,7 @@ static int enable_slot(struct hotplug_slot *hotplug_slot)
 {
         struct slot *slot = hotplug_slot->private;
 
-        ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n",
+        ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
                  __func__, slot_name(slot));
 
         return pciehp_sysfs_enable_slot(slot);
@@ -300,7 +302,7 @@ static int disable_slot(struct hotplug_slot *hotplug_slot)
 {
         struct slot *slot = hotplug_slot->private;
 
-        ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n",
+        ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
                   __func__, slot_name(slot));
 
         return pciehp_sysfs_disable_slot(slot);
@@ -311,7 +313,7 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)
         struct slot *slot = hotplug_slot->private;
         int retval;
 
-        ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n",
+        ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
                   __func__, slot_name(slot));
 
         retval = slot->hpc_ops->get_power_status(slot, value);
@@ -326,7 +328,7 @@ static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value)
         struct slot *slot = hotplug_slot->private;
         int retval;
 
-        ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n",
+        ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
                   __func__, slot_name(slot));
 
         retval = slot->hpc_ops->get_attention_status(slot, value);
@@ -341,7 +343,7 @@ static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value)
         struct slot *slot = hotplug_slot->private;
         int retval;
 
-        ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n",
+        ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
                  __func__, slot_name(slot));
 
         retval = slot->hpc_ops->get_latch_status(slot, value);
@@ -356,7 +358,7 @@ static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value)
         struct slot *slot = hotplug_slot->private;
         int retval;
 
-        ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n",
+        ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
                  __func__, slot_name(slot));
 
         retval = slot->hpc_ops->get_adapter_status(slot, value);
@@ -372,7 +374,7 @@ static int get_max_bus_speed(struct hotplug_slot *hotplug_slot,
         struct slot *slot = hotplug_slot->private;
         int retval;
 
-        ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n",
+        ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
                  __func__, slot_name(slot));
 
         retval = slot->hpc_ops->get_max_bus_speed(slot, value);
@@ -387,7 +389,7 @@ static int get_cur_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_spe
         struct slot *slot = hotplug_slot->private;
         int retval;
 
-        ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n",
+        ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
                  __func__, slot_name(slot));
 
         retval = slot->hpc_ops->get_cur_bus_speed(slot, value);
@@ -414,7 +416,7 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
 
         ctrl = pcie_init(dev);
         if (!ctrl) {
-                dev_err(&dev->device, "controller initialization failed\n");
+                dev_err(&dev->device, "Controller initialization failed\n");
                 goto err_out_none;
         }
         set_service_data(dev, ctrl);
@@ -423,10 +425,10 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
         rc = init_slots(ctrl);
         if (rc) {
                 if (rc == -EBUSY)
-                        ctrl_warn(ctrl, "slot already registered by another "
+                        ctrl_warn(ctrl, "Slot already registered by another "
                                   "hotplug driver\n");
                 else
-                        ctrl_err(ctrl, "slot initialization failed\n");
+                        ctrl_err(ctrl, "Slot initialization failed\n");
                 goto err_out_release_ctlr;
         }
 
@@ -523,7 +525,7 @@ static int __init pcied_init(void)
         dbg("pcie_port_service_register = %d\n", retval);
         info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
         if (retval)
-                dbg("%s: Failure to register service\n", __func__);
+                dbg("Failure to register service\n");
         return retval;
 }
 
diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
index d6c5eb297753..fead63c6b49e 100644
--- a/drivers/pci/hotplug/pciehp_ctrl.c
+++ b/drivers/pci/hotplug/pciehp_ctrl.c
@@ -61,7 +61,7 @@ u8 pciehp_handle_attention_button(struct slot *p_slot)
         struct controller *ctrl = p_slot->ctrl;
 
         /* Attention Button Change */
-        ctrl_dbg(ctrl, "Attention button interrupt received.\n");
+        ctrl_dbg(ctrl, "Attention button interrupt received\n");
 
         /*
          *  Button pressed - See if need to TAKE ACTION!!!
@@ -81,7 +81,7 @@ u8 pciehp_handle_switch_change(struct slot *p_slot)
         struct controller *ctrl = p_slot->ctrl;
 
         /* Switch Change */
-        ctrl_dbg(ctrl, "Switch interrupt received.\n");
+        ctrl_dbg(ctrl, "Switch interrupt received\n");
 
         p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
         if (getstatus) {
@@ -110,7 +110,7 @@ u8 pciehp_handle_presence_change(struct slot *p_slot)
         struct controller *ctrl = p_slot->ctrl;
 
         /* Presence Change */
-        ctrl_dbg(ctrl, "Presence/Notify input change.\n");
+        ctrl_dbg(ctrl, "Presence/Notify input change\n");
 
         /* Switch is open, assume a presence change
          * Save the presence state
@@ -142,7 +142,7 @@ u8 pciehp_handle_power_fault(struct slot *p_slot)
         struct controller *ctrl = p_slot->ctrl;
 
         /* power fault */
-        ctrl_dbg(ctrl, "Power fault interrupt received.\n");
+        ctrl_dbg(ctrl, "Power fault interrupt received\n");
 
         if ( !(p_slot->hpc_ops->query_power_fault(p_slot))) {
                 /*
@@ -157,7 +157,7 @@ u8 pciehp_handle_power_fault(struct slot *p_slot)
                  */
                 ctrl_info(ctrl, "Power fault on Slot(%s)\n", slot_name(p_slot));
                 event_type = INT_POWER_FAULT;
-                ctrl_info(ctrl, "power fault bit %x set\n", 0);
+                ctrl_info(ctrl, "Power fault bit %x set\n", 0);
         }
 
         queue_interrupt_event(p_slot, event_type);
@@ -175,8 +175,7 @@ static void set_slot_off(struct controller *ctrl, struct slot * pslot)
         if (POWER_CTRL(ctrl)) {
                 if (pslot->hpc_ops->power_off_slot(pslot)) {
                         ctrl_err(ctrl,
-                                 "%s: Issue of Slot Power Off command failed\n",
-                                 __func__);
+                                 "Issue of Slot Power Off command failed\n");
                         return;
                 }
         }
@@ -193,8 +192,8 @@ static void set_slot_off(struct controller *ctrl, struct slot * pslot)
 
         if (ATTN_LED(ctrl)) {
                 if (pslot->hpc_ops->set_attention_status(pslot, 1)) {
-                        ctrl_err(ctrl, "%s: Issue of Set Attention "
-                                 "Led command failed\n", __func__);
+                        ctrl_err(ctrl,
+                                 "Issue of Set Attention Led command failed\n");
                         return;
                 }
         }
@@ -211,8 +210,9 @@ static int board_added(struct slot *p_slot)
 {
         int retval = 0;
         struct controller *ctrl = p_slot->ctrl;
+        struct pci_bus *parent = ctrl->pci_dev->subordinate;
 
-        ctrl_dbg(ctrl, "%s: slot device, slot offset, hp slot = %d, %d ,%d\n",
+        ctrl_dbg(ctrl, "%s: slot device, slot offset, hp slot = %d, %d, %d\n",
                  __func__, p_slot->device, ctrl->slot_device_offset,
                  p_slot->hp_slot);
 
@@ -229,22 +229,22 @@ static int board_added(struct slot *p_slot)
         /* Check link training status */
         retval = p_slot->hpc_ops->check_lnk_status(ctrl);
         if (retval) {
-                ctrl_err(ctrl, "%s: Failed to check link status\n", __func__);
+                ctrl_err(ctrl, "Failed to check link status\n");
                 set_slot_off(ctrl, p_slot);
                 return retval;
         }
 
         /* Check for a power fault */
         if (p_slot->hpc_ops->query_power_fault(p_slot)) {
-                ctrl_dbg(ctrl, "%s: power fault detected\n", __func__);
+                ctrl_dbg(ctrl, "Power fault detected\n");
                 retval = POWER_FAILURE;
                 goto err_exit;
         }
 
         retval = pciehp_configure_device(p_slot);
         if (retval) {
-                ctrl_err(ctrl, "Cannot add device 0x%x:%x\n",
-                         p_slot->bus, p_slot->device);
+                ctrl_err(ctrl, "Cannot add device at %04x:%02x:%02x\n",
+                         pci_domain_nr(parent), p_slot->bus, p_slot->device);
                 goto err_exit;
         }
 
@@ -276,14 +276,14 @@ static int remove_board(struct slot *p_slot)
         if (retval)
                 return retval;
 
-        ctrl_dbg(ctrl, "In %s, hp_slot = %d\n", __func__, p_slot->hp_slot);
+        ctrl_dbg(ctrl, "%s: hp_slot = %d\n", __func__, p_slot->hp_slot);
 
         if (POWER_CTRL(ctrl)) {
                 /* power off slot */
                 retval = p_slot->hpc_ops->power_off_slot(p_slot);
                 if (retval) {
-                        ctrl_err(ctrl, "%s: Issue of Slot Disable command "
-                                 "failed\n", __func__);
+                        ctrl_err(ctrl,
+                                 "Issue of Slot Disable command failed\n");
                         return retval;
                 }
         }
@@ -324,8 +324,10 @@ static void pciehp_power_thread(struct work_struct *work)
         switch (p_slot->state) {
         case POWEROFF_STATE:
                 mutex_unlock(&p_slot->lock);
-                ctrl_dbg(p_slot->ctrl, "%s: disabling bus:device(%x:%x)\n",
-                         __func__, p_slot->bus, p_slot->device);
+                ctrl_dbg(p_slot->ctrl,
+                         "Disabling domain:bus:device=%04x:%02x:%02x\n",
+                         pci_domain_nr(p_slot->ctrl->pci_dev->subordinate),
+                         p_slot->bus, p_slot->device);
                 pciehp_disable_slot(p_slot);
                 mutex_lock(&p_slot->lock);
                 p_slot->state = STATIC_STATE;
@@ -433,7 +435,6 @@ static void handle_button_press_event(struct slot *p_slot)
                  * expires to cancel hot-add or hot-remove
                  */
                 ctrl_info(ctrl, "Button cancel on Slot(%s)\n", slot_name(p_slot));
-                ctrl_dbg(ctrl, "%s: button cancel\n", __func__);
                 cancel_delayed_work(&p_slot->work);
                 if (p_slot->state == BLINKINGOFF_STATE) {
                         if (PWR_LED(ctrl))
@@ -537,16 +538,15 @@ int pciehp_enable_slot(struct slot *p_slot)
 
         rc = p_slot->hpc_ops->get_adapter_status(p_slot, &getstatus);
         if (rc || !getstatus) {
-                ctrl_info(ctrl, "%s: no adapter on slot(%s)\n",
-                          __func__, slot_name(p_slot));
+                ctrl_info(ctrl, "No adapter on slot(%s)\n", slot_name(p_slot));
                 mutex_unlock(&p_slot->ctrl->crit_sect);
                 return -ENODEV;
         }
         if (MRL_SENS(p_slot->ctrl)) {
                 rc = p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
                 if (rc || getstatus) {
-                        ctrl_info(ctrl, "%s: latch open on slot(%s)\n",
-                                  __func__, slot_name(p_slot));
+                        ctrl_info(ctrl, "Latch open on slot(%s)\n",
+                                  slot_name(p_slot));
                         mutex_unlock(&p_slot->ctrl->crit_sect);
                         return -ENODEV;
                 }
@@ -555,8 +555,8 @@ int pciehp_enable_slot(struct slot *p_slot)
         if (POWER_CTRL(p_slot->ctrl)) {
                 rc = p_slot->hpc_ops->get_power_status(p_slot, &getstatus);
                 if (rc || getstatus) {
-                        ctrl_info(ctrl, "%s: already enabled on slot(%s)\n",
-                                  __func__, slot_name(p_slot));
+                        ctrl_info(ctrl, "Already enabled on slot(%s)\n",
+                                  slot_name(p_slot));
                         mutex_unlock(&p_slot->ctrl->crit_sect);
                         return -EINVAL;
                 }
@@ -591,8 +591,8 @@ int pciehp_disable_slot(struct slot *p_slot)
         if (!HP_SUPR_RM(p_slot->ctrl)) {
                 ret = p_slot->hpc_ops->get_adapter_status(p_slot, &getstatus);
                 if (ret || !getstatus) {
-                        ctrl_info(ctrl, "%s: no adapter on slot(%s)\n",
-                                  __func__, slot_name(p_slot));
+                        ctrl_info(ctrl, "No adapter on slot(%s)\n",
+                                  slot_name(p_slot));
                         mutex_unlock(&p_slot->ctrl->crit_sect);
                         return -ENODEV;
                 }
@@ -601,8 +601,8 @@ int pciehp_disable_slot(struct slot *p_slot)
         if (MRL_SENS(p_slot->ctrl)) {
                 ret = p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
                 if (ret || getstatus) {
-                        ctrl_info(ctrl, "%s: latch open on slot(%s)\n",
-                                  __func__, slot_name(p_slot));
+                        ctrl_info(ctrl, "Latch open on slot(%s)\n",
+                                  slot_name(p_slot));
                         mutex_unlock(&p_slot->ctrl->crit_sect);
                         return -ENODEV;
                 }
@@ -611,8 +611,8 @@ int pciehp_disable_slot(struct slot *p_slot)
         if (POWER_CTRL(p_slot->ctrl)) {
                 ret = p_slot->hpc_ops->get_power_status(p_slot, &getstatus);
                 if (ret || !getstatus) {
-                        ctrl_info(ctrl, "%s: already disabled slot(%s)\n",
-                                  __func__, slot_name(p_slot));
+                        ctrl_info(ctrl, "Already disabled on slot(%s)\n",
+                                  slot_name(p_slot));
                         mutex_unlock(&p_slot->ctrl->crit_sect);
                         return -EINVAL;
                 }
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index 58c72d2cc217..b643ca13e4f1 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -316,22 +316,19 @@ static int pcie_write_cmd(struct controller *ctrl, u16 cmd, u16 mask)
                          * proceed forward to issue the next command according
                          * to spec. Just print out the error message.
                          */
-                        ctrl_dbg(ctrl,
-                                 "%s: CMD_COMPLETED not clear after 1 sec.\n",
-                                 __func__);
+                        ctrl_dbg(ctrl, "CMD_COMPLETED not clear after 1 sec\n");
                 } else if (!NO_CMD_CMPL(ctrl)) {
                         /*
                          * This controller semms to notify of command completed
                          * event even though it supports none of power
                          * controller, attention led, power led and EMI.
                          */
-                        ctrl_dbg(ctrl, "%s: Unexpected CMD_COMPLETED. Need to "
-                                 "wait for command completed event.\n",
-                                 __func__);
+                        ctrl_dbg(ctrl, "Unexpected CMD_COMPLETED. Need to "
+                                 "wait for command completed event.\n");
                         ctrl->no_cmd_complete = 0;
                 } else {
-                        ctrl_dbg(ctrl, "%s: Unexpected CMD_COMPLETED. Maybe "
-                                 "the controller is broken.\n", __func__);
+                        ctrl_dbg(ctrl, "Unexpected CMD_COMPLETED. Maybe "
+                                 "the controller is broken.\n");
                 }
         }
 
@@ -347,8 +344,7 @@ static int pcie_write_cmd(struct controller *ctrl, u16 cmd, u16 mask)
         smp_mb();
         retval = pciehp_writew(ctrl, SLOTCTRL, slot_ctrl);
         if (retval)
-                ctrl_err(ctrl, "%s: Cannot write to SLOTCTRL register\n",
-                         __func__);
+                ctrl_err(ctrl, "Cannot write to SLOTCTRL register\n");
 
         /*
          * Wait for command completion.
@@ -418,15 +414,14 @@ static int hpc_check_lnk_status(struct controller *ctrl)
 
         retval = pciehp_readw(ctrl, LNKSTATUS, &lnk_status);
         if (retval) {
-                ctrl_err(ctrl, "%s: Cannot read LNKSTATUS register\n",
-                         __func__);
+                ctrl_err(ctrl, "Cannot read LNKSTATUS register\n");
                 return retval;
         }
 
         ctrl_dbg(ctrl, "%s: lnk_status = %x\n", __func__, lnk_status);
         if ( (lnk_status & LNK_TRN) || (lnk_status & LNK_TRN_ERR) ||
                 !(lnk_status & NEG_LINK_WD)) {
-                ctrl_err(ctrl, "%s : Link Training Error occurs \n", __func__);
+                ctrl_err(ctrl, "Link Training Error occurs \n");
                 retval = -1;
                 return retval;
         }
@@ -551,7 +546,7 @@ static int hpc_query_power_fault(struct slot *slot)
 
         retval = pciehp_readw(ctrl, SLOTSTATUS, &slot_status);
         if (retval) {
-                ctrl_err(ctrl, "%s: Cannot check for power fault\n", __func__);
+                ctrl_err(ctrl, "Cannot check for power fault\n");
                 return retval;
         }
         pwr_fault = (u8)((slot_status & PWR_FAULT_DETECTED) >> 1);
@@ -567,7 +562,7 @@ static int hpc_get_emi_status(struct slot *slot, u8 *status)
 
         retval = pciehp_readw(ctrl, SLOTSTATUS, &slot_status);
         if (retval) {
-                ctrl_err(ctrl, "%s : Cannot check EMI status\n", __func__);
+                ctrl_err(ctrl, "Cannot check EMI status\n");
                 return retval;
         }
         *status = (slot_status & EMI_STATE) >> EMI_STATUS_BIT;
@@ -697,8 +692,7 @@ static int hpc_power_on_slot(struct slot * slot)
         retval = pcie_write_cmd(ctrl, slot_cmd, cmd_mask);
 
         if (retval) {
-                ctrl_err(ctrl, "%s: Write %x command failed!\n",
-                         __func__, slot_cmd);
+                ctrl_err(ctrl, "Write %x command failed!\n", slot_cmd);
                 return -1;
         }
         ctrl_dbg(ctrl, "%s: SLOTCTRL %x write cmd %x\n",
@@ -776,7 +770,7 @@ static int hpc_power_off_slot(struct slot * slot)
 
         retval = pcie_write_cmd(ctrl, slot_cmd, cmd_mask);
         if (retval) {
-                ctrl_err(ctrl, "%s: Write command failed!\n", __func__);
+                ctrl_err(ctrl, "Write command failed!\n");
                 retval = -1;
                 goto out;
         }
@@ -1056,8 +1050,7 @@ int pcie_enable_notification(struct controller *ctrl)
                PWR_FAULT_DETECT_ENABLE | HP_INTR_ENABLE | CMD_CMPL_INTR_ENABLE;
 
         if (pcie_write_cmd(ctrl, cmd, mask)) {
-                ctrl_err(ctrl, "%s: Cannot enable software notification\n",
-                         __func__);
+                ctrl_err(ctrl, "Cannot enable software notification\n");
                 return -1;
         }
         return 0;
@@ -1069,8 +1062,7 @@ static void pcie_disable_notification(struct controller *ctrl)
         mask = PRSN_DETECT_ENABLE | ATTN_BUTTN_ENABLE | MRL_DETECT_ENABLE |
                PWR_FAULT_DETECT_ENABLE | HP_INTR_ENABLE | CMD_CMPL_INTR_ENABLE;
         if (pcie_write_cmd(ctrl, 0, mask))
-                ctrl_warn(ctrl, "%s: Cannot disable software notification\n",
-                          __func__);
+                ctrl_warn(ctrl, "Cannot disable software notification\n");
 }
 
 static int pcie_init_notification(struct controller *ctrl)
@@ -1179,7 +1171,7 @@ struct controller *pcie_init(struct pcie_device *dev)
 
         ctrl = kzalloc(sizeof(*ctrl), GFP_KERNEL);
         if (!ctrl) {
-                dev_err(&dev->device, "%s : out of memory\n", __func__);
+                dev_err(&dev->device, "%s: Out of memory\n", __func__);
                 goto abort;
         }
         INIT_LIST_HEAD(&ctrl->slot_list);
@@ -1188,12 +1180,11 @@ struct controller *pcie_init(struct pcie_device *dev)
         ctrl->pci_dev = pdev;
         ctrl->cap_base = pci_find_capability(pdev, PCI_CAP_ID_EXP);
         if (!ctrl->cap_base) {
-                ctrl_err(ctrl, "%s: Cannot find PCI Express capability\n",
-                         __func__);
+                ctrl_err(ctrl, "Cannot find PCI Express capability\n");
                 goto abort_ctrl;
         }
         if (pciehp_readl(ctrl, SLOTCAP, &slot_cap)) {
-                ctrl_err(ctrl, "%s: Cannot read SLOTCAP register\n", __func__);
+                ctrl_err(ctrl, "Cannot read SLOTCAP register\n");
                 goto abort_ctrl;
         }
 
diff --git a/drivers/pci/hotplug/pciehp_pci.c b/drivers/pci/hotplug/pciehp_pci.c
index ffd11148fbe2..10f9566cceeb 100644
--- a/drivers/pci/hotplug/pciehp_pci.c
+++ b/drivers/pci/hotplug/pciehp_pci.c
@@ -39,8 +39,7 @@ static void program_hpp_type0(struct pci_dev *dev, struct hpp_type0 *hpp)
         u16 pci_cmd, pci_bctl;
 
         if (hpp->revision > 1) {
-                printk(KERN_WARNING "%s: Rev.%d type0 record not supported\n",
-                       __func__, hpp->revision);
+                warn("Rev.%d type0 record not supported\n", hpp->revision);
                 return;
         }
 
@@ -81,8 +80,7 @@ static void program_hpp_type2(struct pci_dev *dev, struct hpp_type2 *hpp)
         u32 reg32;
 
         if (hpp->revision > 1) {
-                printk(KERN_WARNING "%s: Rev.%d type2 record not supported\n",
-                       __func__, hpp->revision);
+                warn("Rev.%d type2 record not supported\n", hpp->revision);
                 return;
         }
 
@@ -149,8 +147,7 @@ static void program_fw_provided_values(struct pci_dev *dev)
                 return;
 
         if (pciehp_get_hp_params_from_firmware(dev, &hpp)) {
-                printk(KERN_WARNING "%s: Could not get hotplug parameters\n",
-                       __func__);
+                warn("Could not get hotplug parameters\n");
                 return;
         }
 
@@ -202,9 +199,9 @@ int pciehp_configure_device(struct slot *p_slot)
 
         dev = pci_get_slot(parent, PCI_DEVFN(p_slot->device, 0));
         if (dev) {
-                ctrl_err(ctrl,
-                         "Device %s already exists at %x:%x, cannot hot-add\n",
-                         pci_name(dev), p_slot->bus, p_slot->device);
+                ctrl_err(ctrl, "Device %s already exists "
+                         "at %04x:%02x:%02x, cannot hot-add\n", pci_name(dev),
+                         pci_domain_nr(parent), p_slot->bus, p_slot->device);
                 pci_dev_put(dev);
                 return -EINVAL;
         }
@@ -248,8 +245,8 @@ int pciehp_unconfigure_device(struct slot *p_slot)
         u16 command;
         struct controller *ctrl = p_slot->ctrl;
 
-        ctrl_dbg(ctrl, "%s: bus/dev = %x/%x\n", __func__,
-                 p_slot->bus, p_slot->device);
+        ctrl_dbg(ctrl, "%s: domain:bus:dev = %04x:%02x:%02x\n",
+                 __func__, pci_domain_nr(parent), p_slot->bus, p_slot->device);
         ret = p_slot->hpc_ops->get_adapter_status(p_slot, &presence);
         if (ret)
                 presence = 0;