1 files changed, 47 insertions, 31 deletions

diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index 4fd5355bc3b..c748a19db89 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -144,9 +144,10 @@ set_lock_exit:
  * sysfs interface which allows the user to toggle the Electro Mechanical
  * Interlock.  Valid values are either 0 or 1.  0 == unlock, 1 == lock
  */
-static ssize_t lock_write_file(struct hotplug_slot *slot, const char *buf,
-                size_t count)
+static ssize_t lock_write_file(struct hotplug_slot *hotplug_slot,
+                const char *buf, size_t count)
 {
+        struct slot *slot = hotplug_slot->private;
         unsigned long llock;
         u8 lock;
         int retval = 0;
@@ -157,10 +158,11 @@ static ssize_t lock_write_file(struct hotplug_slot *slot, const char *buf,
         switch (lock) {
                 case 0:
                 case 1:
-                        retval = set_lock_status(slot, lock);
+                        retval = set_lock_status(hotplug_slot, lock);
                         break;
                 default:
-                        err ("%d is an invalid lock value\n", lock);
+                        ctrl_err(slot->ctrl, "%d is an invalid lock value\n",
+                                 lock);
                         retval = -EINVAL;
         }
         if (retval)
@@ -180,7 +182,10 @@ static struct hotplug_slot_attribute hotplug_slot_attr_lock = {
  */
 static void release_slot(struct hotplug_slot *hotplug_slot)
 {
-        dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
+        struct slot *slot = hotplug_slot->private;
+
+        ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n",
+                 __func__, hotplug_slot->name);
 
         kfree(hotplug_slot->info);
         kfree(hotplug_slot);
@@ -215,9 +220,9 @@ static int init_slots(struct controller *ctrl)
                 get_adapter_status(hotplug_slot, &info->adapter_status);
                 slot->hotplug_slot = hotplug_slot;
 
-                dbg("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 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);
 duplicate_name:
                 retval = pci_hp_register(hotplug_slot,
                                          ctrl->pci_dev->subordinate,
@@ -233,9 +238,11 @@ duplicate_name:
                                 if (len < SLOT_NAME_SIZE)
                                         goto duplicate_name;
                                 else
-                                        err("duplicate slot name overflow\n");
+                                        ctrl_err(ctrl, "duplicate slot name "
+                                                 "overflow\n");
                         }
-                        err("pci_hp_register failed with error %d\n", retval);
+                        ctrl_err(ctrl, "pci_hp_register failed with error %d\n",
+                                 retval);
                         goto error_info;
                 }
                 /* create additional sysfs entries */
@@ -244,7 +251,8 @@ duplicate_name:
                                 &hotplug_slot_attr_lock.attr);
                         if (retval) {
                                 pci_hp_deregister(hotplug_slot);
-                                err("cannot create additional sysfs entries\n");
+                                ctrl_err(ctrl, "cannot create additional sysfs "
+                                         "entries\n");
                                 goto error_info;
                         }
                 }
@@ -278,7 +286,8 @@ static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 status)
 {
         struct slot *slot = hotplug_slot->private;
 
-        dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
+        ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n",
+                  __func__, hotplug_slot->name);
 
         hotplug_slot->info->attention_status = status;
 
@@ -293,7 +302,8 @@ static int enable_slot(struct hotplug_slot *hotplug_slot)
 {
         struct slot *slot = hotplug_slot->private;
 
-        dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
+        ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n",
+                 __func__, hotplug_slot->name);
 
         return pciehp_sysfs_enable_slot(slot);
 }
@@ -303,7 +313,8 @@ static int disable_slot(struct hotplug_slot *hotplug_slot)
 {
         struct slot *slot = hotplug_slot->private;
 
-        dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
+        ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n",
+                  __func__, hotplug_slot->name);
 
         return pciehp_sysfs_disable_slot(slot);
 }
@@ -313,7 +324,8 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)
         struct slot *slot = hotplug_slot->private;
         int retval;
 
-        dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
+        ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n",
+                  __func__, hotplug_slot->name);
 
         retval = slot->hpc_ops->get_power_status(slot, value);
         if (retval < 0)
@@ -327,7 +339,8 @@ static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value)
         struct slot *slot = hotplug_slot->private;
         int retval;
 
-        dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
+        ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n",
+                  __func__, hotplug_slot->name);
 
         retval = slot->hpc_ops->get_attention_status(slot, value);
         if (retval < 0)
@@ -341,7 +354,8 @@ static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value)
         struct slot *slot = hotplug_slot->private;
         int retval;
 
-        dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
+        ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n",
+                 __func__, hotplug_slot->name);
 
         retval = slot->hpc_ops->get_latch_status(slot, value);
         if (retval < 0)
@@ -355,7 +369,8 @@ static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value)
         struct slot *slot = hotplug_slot->private;
         int retval;
 
-        dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
+        ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n",
+                 __func__, hotplug_slot->name);
 
         retval = slot->hpc_ops->get_adapter_status(slot, value);
         if (retval < 0)
@@ -370,7 +385,8 @@ static int get_max_bus_speed(struct hotplug_slot *hotplug_slot,
         struct slot *slot = hotplug_slot->private;
         int retval;
 
-        dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
+        ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n",
+                 __func__, hotplug_slot->name);
 
         retval = slot->hpc_ops->get_max_bus_speed(slot, value);
         if (retval < 0)
@@ -384,7 +400,8 @@ static int get_cur_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_spe
         struct slot *slot = hotplug_slot->private;
         int retval;
 
-        dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
+        ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n",
+                 __func__, hotplug_slot->name);
 
         retval = slot->hpc_ops->get_cur_bus_speed(slot, value);
         if (retval < 0)
@@ -402,14 +419,15 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
         struct pci_dev *pdev = dev->port;
 
         if (pciehp_force)
-                dbg("Bypassing BIOS check for pciehp use on %s\n",
-                    pci_name(pdev));
+                dev_info(&dev->device,
+                         "Bypassing BIOS check for pciehp use on %s\n",
+                         pci_name(pdev));
         else if (pciehp_get_hp_hw_control_from_firmware(pdev))
                 goto err_out_none;
 
         ctrl = pcie_init(dev);
         if (!ctrl) {
-                dbg("%s: controller initialization failed\n", PCIE_MODULE_NAME);
+                dev_err(&dev->device, "controller initialization failed\n");
                 goto err_out_none;
         }
         set_service_data(dev, ctrl);
@@ -418,11 +436,10 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
         rc = init_slots(ctrl);
         if (rc) {
                 if (rc == -EBUSY)
-                        warn("%s: slot already registered by another "
-                                "hotplug driver\n", PCIE_MODULE_NAME);
+                        ctrl_warn(ctrl, "slot already registered by another "
+                                  "hotplug driver\n");
                 else
-                        err("%s: slot initialization failed\n",
-                                PCIE_MODULE_NAME);
+                        ctrl_err(ctrl, "slot initialization failed\n");
                 goto err_out_release_ctlr;
         }
 
@@ -461,13 +478,13 @@ static void pciehp_remove (struct pcie_device *dev)
 #ifdef CONFIG_PM
 static int pciehp_suspend (struct pcie_device *dev, pm_message_t state)
 {
-        printk("%s ENTRY\n", __func__);
+        dev_info(&dev->device, "%s ENTRY\n", __func__);
         return 0;
 }
 
 static int pciehp_resume (struct pcie_device *dev)
 {
-        printk("%s ENTRY\n", __func__);
+        dev_info(&dev->device, "%s ENTRY\n", __func__);
         if (pciehp_force) {
                 struct controller *ctrl = get_service_data(dev);
                 struct slot *t_slot;
@@ -497,10 +514,9 @@ static struct pcie_port_service_id port_pci_ids[] = { {
         .driver_data =  0,
         }, { /* end: all zeroes */ }
 };
-static const char device_name[] = "hpdriver";
 
 static struct pcie_port_service_driver hpdriver_portdrv = {
-        .name           = (char *)device_name,
+        .name           = PCIE_MODULE_NAME,
         .id_table       = &port_pci_ids[0],
 
         .probe          = pciehp_probe,