1 files changed, 19 insertions, 3 deletions

diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h
index 4d9fed00e1d0..6aba0b6cf2e0 100644
--- a/drivers/pci/hotplug/shpchp.h
+++ b/drivers/pci/hotplug/shpchp.h
@@ -59,6 +59,20 @@ extern struct workqueue_struct *shpchp_wq;
 #define warn(format, arg...)                                            \
         printk(KERN_WARNING "%s: " format, MY_NAME , ## arg)
 
+#define ctrl_dbg(ctrl, format, arg...)                                  \
+        do {                                                            \
+                if (shpchp_debug)                                       \
+                        dev_printk(, &ctrl->pci_dev->dev,               \
+                                        format, ## arg);                \
+        } while (0)
+#define ctrl_err(ctrl, format, arg...)                                  \
+        dev_err(&ctrl->pci_dev->dev, format, ## arg)
+#define ctrl_info(ctrl, format, arg...)                                 \
+        dev_info(&ctrl->pci_dev->dev, format, ## arg)
+#define ctrl_warn(ctrl, format, arg...)                                 \
+        dev_warn(&ctrl->pci_dev->dev, format, ## arg)
+
+
 #define SLOT_NAME_SIZE 10
 struct slot {
         u8 bus;
@@ -239,7 +253,7 @@ static inline struct slot *shpchp_find_slot(struct controller *ctrl, u8 device)
                         return slot;
         }
 
-        err("%s: slot (device=0x%x) not found\n", __func__, device);
+        ctrl_err(ctrl, "Slot (device=0x%02x) not found\n", device);
         return NULL;
 }
 
@@ -273,7 +287,9 @@ static inline void amd_pogo_errata_restore_misc_reg(struct slot *p_slot)
         pci_read_config_dword(p_slot->ctrl->pci_dev, PCIX_MISC_BRIDGE_ERRORS_OFFSET, &pcix_bridge_errors_reg);
         perr_set = pcix_bridge_errors_reg & PERR_OBSERVED_MASK;
         if (perr_set) {
-                dbg ("%s  W1C: Bridge_Errors[ PERR_OBSERVED = %08X]\n",__func__ , perr_set);
+                ctrl_dbg(p_slot->ctrl,
+                         "Bridge_Errors[ PERR_OBSERVED = %08X] (W1C)\n",
+                         perr_set);
 
                 pci_write_config_dword(p_slot->ctrl->pci_dev, PCIX_MISC_BRIDGE_ERRORS_OFFSET, perr_set);
         }
@@ -282,7 +298,7 @@ static inline void amd_pogo_errata_restore_misc_reg(struct slot *p_slot)
         pci_read_config_dword(p_slot->ctrl->pci_dev, PCIX_MEM_BASE_LIMIT_OFFSET, &pcix_mem_base_reg);
         rse_set = pcix_mem_base_reg & RSE_MASK;
         if (rse_set) {
-                dbg ("%s  W1C: Memory_Base_Limit[ RSE ]\n",__func__ );
+                ctrl_dbg(p_slot->ctrl, "Memory_Base_Limit[ RSE ] (W1C)\n");
 
                 pci_write_config_dword(p_slot->ctrl->pci_dev, PCIX_MEM_BASE_LIMIT_OFFSET, rse_set);
         }