PCI hotplug: shpchp: replace printk with dev_printk

This patch replaces printks within shpchp module with dev_printks.

Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

1 files changed, 93 insertions, 69 deletions

diff --git a/drivers/pci/hotplug/shpchp_ctrl.c b/drivers/pci/hotplug/shpchp_ctrl.c
index 919b1ee44313..c9049f17864e 100644
--- a/drivers/pci/hotplug/shpchp_ctrl.c
+++ b/drivers/pci/hotplug/shpchp_ctrl.c
@@ -62,7 +62,7 @@ u8 shpchp_handle_attention_button(u8 hp_slot, struct controller *ctrl)
         u32 event_type;
 
         /* Attention Button Change */
-        dbg("shpchp:  Attention button interrupt received.\n");
+        ctrl_dbg(ctrl, "Attention button interrupt received.\n");
 
         p_slot = shpchp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
         p_slot->hpc_ops->get_adapter_status(p_slot, &(p_slot->presence_save));
@@ -70,7 +70,7 @@ u8 shpchp_handle_attention_button(u8 hp_slot, struct controller *ctrl)
         /*
          *  Button pressed - See if need to TAKE ACTION!!!
          */
-        info("Button pressed on Slot(%s)\n", slot_name(p_slot));
+        ctrl_info(ctrl, "Button pressed on Slot(%s)\n", slot_name(p_slot));
         event_type = INT_BUTTON_PRESS;
 
         queue_interrupt_event(p_slot, event_type);
@@ -86,29 +86,29 @@ u8 shpchp_handle_switch_change(u8 hp_slot, struct controller *ctrl)
         u32 event_type;
 
         /* Switch Change */
-        dbg("shpchp:  Switch interrupt received.\n");
+        ctrl_dbg(ctrl, "Switch interrupt received.\n");
 
         p_slot = shpchp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
         p_slot->hpc_ops->get_adapter_status(p_slot, &(p_slot->presence_save));
         p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
-        dbg("%s: Card present %x Power status %x\n", __func__,
-                p_slot->presence_save, p_slot->pwr_save);
+        ctrl_dbg(ctrl, "%s: Card present %x Power status %x\n",
+                 __func__, p_slot->presence_save, p_slot->pwr_save);
 
         if (getstatus) {
                 /*
                  * Switch opened
                  */
-                info("Latch open on Slot(%s)\n", slot_name(p_slot));
+                ctrl_info(ctrl, "Latch open on Slot(%s)\n", slot_name(p_slot));
                 event_type = INT_SWITCH_OPEN;
                 if (p_slot->pwr_save && p_slot->presence_save) {
                         event_type = INT_POWER_FAULT;
-                        err("Surprise Removal of card\n");
+                        ctrl_err(ctrl, "Surprise Removal of card\n");
                 }
         } else {
                 /*
                  *  Switch closed
                  */
-                info("Latch close on Slot(%s)\n", slot_name(p_slot));
+                ctrl_info(ctrl, "Latch close on Slot(%s)\n", slot_name(p_slot));
                 event_type = INT_SWITCH_CLOSE;
         }
 
@@ -123,7 +123,7 @@ u8 shpchp_handle_presence_change(u8 hp_slot, struct controller *ctrl)
         u32 event_type;
 
         /* Presence Change */
-        dbg("shpchp:  Presence/Notify input change.\n");
+        ctrl_dbg(ctrl, "Presence/Notify input change.\n");
 
         p_slot = shpchp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
 
@@ -135,13 +135,15 @@ u8 shpchp_handle_presence_change(u8 hp_slot, struct controller *ctrl)
                 /*
                  * Card Present
                  */
-                info("Card present on Slot(%s)\n", slot_name(p_slot));
+                ctrl_info(ctrl, "Card present on Slot(%s)\n",
+                          slot_name(p_slot));
                 event_type = INT_PRESENCE_ON;
         } else {
                 /*
                  * Not Present
                  */
-                info("Card not present on Slot(%s)\n", slot_name(p_slot));
+                ctrl_info(ctrl, "Card not present on Slot(%s)\n",
+                          slot_name(p_slot));
                 event_type = INT_PRESENCE_OFF;
         }
 
@@ -156,7 +158,7 @@ u8 shpchp_handle_power_fault(u8 hp_slot, struct controller *ctrl)
         u32 event_type;
 
         /* Power fault */
-        dbg("shpchp:  Power fault interrupt received.\n");
+        ctrl_dbg(ctrl, "Power fault interrupt received.\n");
 
         p_slot = shpchp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
 
@@ -164,18 +166,19 @@ u8 shpchp_handle_power_fault(u8 hp_slot, struct controller *ctrl)
                 /*
                  * Power fault Cleared
                  */
-                info("Power fault cleared on Slot(%s)\n", slot_name(p_slot));
+                ctrl_info(ctrl, "Power fault cleared on Slot(%s)\n",
+                          slot_name(p_slot));
                 p_slot->status = 0x00;
                 event_type = INT_POWER_FAULT_CLEAR;
         } else {
                 /*
                  *   Power fault
                  */
-                info("Power fault on Slot(%s)\n", slot_name(p_slot));
+                ctrl_info(ctrl, "Power fault on Slot(%s)\n", slot_name(p_slot));
                 event_type = INT_POWER_FAULT;
                 /* set power fault status for this board */
                 p_slot->status = 0xFF;
-                info("power fault bit %x set\n", hp_slot);
+                ctrl_info(ctrl, "power fault bit %x set\n", hp_slot);
         }
 
         queue_interrupt_event(p_slot, event_type);
@@ -191,10 +194,10 @@ static int change_bus_speed(struct controller *ctrl, struct slot *p_slot,
 {
         int rc = 0;
 
-        dbg("%s: change to speed %d\n", __func__, speed);
+        ctrl_dbg(ctrl, "%s: change to speed %d\n", __func__, speed);
         if ((rc = p_slot->hpc_ops->set_bus_speed_mode(p_slot, speed))) {
-                err("%s: Issue of set bus speed mode command failed\n",
-                    __func__);
+                ctrl_err(ctrl, "%s: Issue of set bus speed mode command "
+                         "failed\n", __func__);
                 return WRONG_BUS_FREQUENCY;
         }
         return rc;
@@ -212,8 +215,8 @@ static int fix_bus_speed(struct controller *ctrl, struct slot *pslot,
          */
         if (flag) {
                 if (asp < bsp) {
-                        err("%s: speed of bus %x and adapter %x mismatch\n",
-                            __func__, bsp, asp);
+                        ctrl_err(ctrl, "%s: speed of bus %x and adapter %x "
+                                 "mismatch\n", __func__, bsp, asp);
                         rc = WRONG_BUS_FREQUENCY;
                 }
                 return rc;
@@ -246,14 +249,14 @@ static int board_added(struct slot *p_slot)
 
         hp_slot = p_slot->device - ctrl->slot_device_offset;
 
-        dbg("%s: p_slot->device, slot_offset, hp_slot = %d, %d ,%d\n",
-                        __func__, p_slot->device,
-                        ctrl->slot_device_offset, hp_slot);
+        ctrl_dbg(ctrl,
+                 "%s: p_slot->device, slot_offset, hp_slot = %d, %d ,%d\n",
+                 __func__, p_slot->device, ctrl->slot_device_offset, hp_slot);
 
         /* Power on slot without connecting to bus */
         rc = p_slot->hpc_ops->power_on_slot(p_slot);
         if (rc) {
-                err("%s: Failed to power on slot\n", __func__);
+                ctrl_err(ctrl, "%s: Failed to power on slot\n", __func__);
                 return -1;
         }
 
@@ -262,33 +265,36 @@ static int board_added(struct slot *p_slot)
                         return WRONG_BUS_FREQUENCY;
 
                 if ((rc = p_slot->hpc_ops->set_bus_speed_mode(p_slot, PCI_SPEED_33MHz))) {
-                        err("%s: Issue of set bus speed mode command failed\n", __func__);
+                        ctrl_err(ctrl, "%s: Issue of set bus speed mode command"
+                                 " failed\n", __func__);
                         return WRONG_BUS_FREQUENCY;
                 }
 
                 /* turn on board, blink green LED, turn off Amber LED */
                 if ((rc = p_slot->hpc_ops->slot_enable(p_slot))) {
-                        err("%s: Issue of Slot Enable command failed\n", __func__);
+                        ctrl_err(ctrl, "%s: Issue of Slot Enable command"
+                                 " failed\n", __func__);
                         return rc;
                 }
         }
 
         rc = p_slot->hpc_ops->get_adapter_speed(p_slot, &asp);
         if (rc) {
-                err("%s: Can't get adapter speed or bus mode mismatch\n",
-                    __func__);
+                ctrl_err(ctrl, "%s: Can't get adapter speed or bus mode "
+                         "mismatch\n", __func__);
                 return WRONG_BUS_FREQUENCY;
         }
 
         rc = p_slot->hpc_ops->get_cur_bus_speed(p_slot, &bsp);
         if (rc) {
-                err("%s: Can't get bus operation speed\n", __func__);
+                ctrl_err(ctrl, "%s: Can't get bus operation speed\n", __func__);
                 return WRONG_BUS_FREQUENCY;
         }
 
         rc = p_slot->hpc_ops->get_max_bus_speed(p_slot, &msp);
         if (rc) {
-                err("%s: Can't get max bus operation speed\n", __func__);
+                ctrl_err(ctrl, "%s: Can't get max bus operation speed\n",
+                         __func__);
                 msp = bsp;
         }
 
@@ -296,9 +302,9 @@ static int board_added(struct slot *p_slot)
         if (!list_empty(&ctrl->pci_dev->subordinate->devices))
                 slots_not_empty = 1;
 
-        dbg("%s: slots_not_empty %d, adapter_speed %d, bus_speed %d, "
-            "max_bus_speed %d\n", __func__, slots_not_empty, asp,
-            bsp, msp);
+        ctrl_dbg(ctrl, "%s: slots_not_empty %d, adapter_speed %d, bus_speed %d,"
+                 " max_bus_speed %d\n", __func__, slots_not_empty, asp,
+                 bsp, msp);
 
         rc = fix_bus_speed(ctrl, p_slot, slots_not_empty, asp, bsp, msp);
         if (rc)
@@ -306,26 +312,27 @@ static int board_added(struct slot *p_slot)
 
         /* turn on board, blink green LED, turn off Amber LED */
         if ((rc = p_slot->hpc_ops->slot_enable(p_slot))) {
-                err("%s: Issue of Slot Enable command failed\n", __func__);
+                ctrl_err(ctrl, "%s: Issue of Slot Enable command failed\n",
+                         __func__);
                 return rc;
         }
 
         /* Wait for ~1 second */
         msleep(1000);
 
-        dbg("%s: slot status = %x\n", __func__, p_slot->status);
+        ctrl_dbg(ctrl, "%s: slot status = %x\n", __func__, p_slot->status);
         /* Check for a power fault */
         if (p_slot->status == 0xFF) {
                 /* power fault occurred, but it was benign */
-                dbg("%s: power fault\n", __func__);
+                ctrl_dbg(ctrl, "%s: power fault\n", __func__);
                 rc = POWER_FAILURE;
                 p_slot->status = 0;
                 goto err_exit;
         }
 
         if (shpchp_configure_device(p_slot)) {
-                err("Cannot add device at 0x%x:0x%x\n", p_slot->bus,
-                                p_slot->device);
+                ctrl_err(ctrl, "Cannot add device at 0x%x:0x%x\n",
+                         p_slot->bus, p_slot->device);
                 goto err_exit;
         }
 
@@ -341,7 +348,8 @@ err_exit:
         /* turn off slot, turn on Amber LED, turn off Green LED */
         rc = p_slot->hpc_ops->slot_disable(p_slot);
         if (rc) {
-                err("%s: Issue of Slot Disable command failed\n", __func__);
+                ctrl_err(ctrl, "%s: Issue of Slot Disable command failed\n",
+                         __func__);
                 return rc;
         }
 
@@ -365,7 +373,7 @@ static int remove_board(struct slot *p_slot)
         hp_slot = p_slot->device - ctrl->slot_device_offset;
         p_slot = shpchp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
 
-        dbg("In %s, hp_slot = %d\n", __func__, hp_slot);
+        ctrl_dbg(ctrl, "In %s, hp_slot = %d\n", __func__, hp_slot);
 
         /* Change status to shutdown */
         if (p_slot->is_a_board)
@@ -374,13 +382,15 @@ static int remove_board(struct slot *p_slot)
         /* turn off slot, turn on Amber LED, turn off Green LED */
         rc = p_slot->hpc_ops->slot_disable(p_slot);
         if (rc) {
-                err("%s: Issue of Slot Disable command failed\n", __func__);
+                ctrl_err(ctrl, "%s: Issue of Slot Disable command failed\n",
+                         __func__);
                 return rc;
         }
 
         rc = p_slot->hpc_ops->set_attention_status(p_slot, 0);
         if (rc) {
-                err("%s: Issue of Set Attention command failed\n", __func__);
+                ctrl_err(ctrl, "%s: Issue of Set Attention command failed\n",
+                         __func__);
                 return rc;
         }
 
@@ -439,7 +449,8 @@ void shpchp_queue_pushbutton_work(struct work_struct *work)
 
         info = kmalloc(sizeof(*info), GFP_KERNEL);
         if (!info) {
-                err("%s: Cannot allocate memory\n", __func__);
+                ctrl_err(p_slot->ctrl, "%s: Cannot allocate memory\n",
+                         __func__);
                 return;
         }
         info->p_slot = p_slot;
@@ -486,18 +497,19 @@ static int update_slot_info (struct slot *slot)
 static void handle_button_press_event(struct slot *p_slot)
 {
         u8 getstatus;
+        struct controller *ctrl = p_slot->ctrl;
 
         switch (p_slot->state) {
         case STATIC_STATE:
                 p_slot->hpc_ops->get_power_status(p_slot, &getstatus);
                 if (getstatus) {
                         p_slot->state = BLINKINGOFF_STATE;
-                        info("PCI slot #%s - powering off due to button "
-                             "press.\n", slot_name(p_slot));
+                        ctrl_info(ctrl, "PCI slot #%s - powering off due to "
+                                  "button press.\n", slot_name(p_slot));
                 } else {
                         p_slot->state = BLINKINGON_STATE;
-                        info("PCI slot #%s - powering on due to button "
-                             "press.\n", slot_name(p_slot));
+                        ctrl_info(ctrl, "PCI slot #%s - powering on due to "
+                                  "button press.\n", slot_name(p_slot));
                 }
                 /* blink green LED and turn off amber */
                 p_slot->hpc_ops->green_led_blink(p_slot);
@@ -512,16 +524,17 @@ static void handle_button_press_event(struct slot *p_slot)
                  * press the attention again before the 5 sec. limit
                  * expires to cancel hot-add or hot-remove
                  */
-                info("Button cancel on Slot(%s)\n", slot_name(p_slot));
-                dbg("%s: button cancel\n", __func__);
+                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)
                         p_slot->hpc_ops->green_led_on(p_slot);
                 else
                         p_slot->hpc_ops->green_led_off(p_slot);
                 p_slot->hpc_ops->set_attention_status(p_slot, 0);
-                info("PCI slot #%s - action canceled due to button press\n",
-                     slot_name(p_slot));
+                ctrl_info(ctrl, "PCI slot #%s - action canceled due to "
+                          "button press\n", slot_name(p_slot));
                 p_slot->state = STATIC_STATE;
                 break;
         case POWEROFF_STATE:
@@ -531,11 +544,12 @@ static void handle_button_press_event(struct slot *p_slot)
                  * this means that the previous attention button action
                  * to hot-add or hot-remove is undergoing
                  */
-                info("Button ignore on Slot(%s)\n", slot_name(p_slot));
+                ctrl_info(ctrl, "Button ignore on Slot(%s)\n",
+                          slot_name(p_slot));
                 update_slot_info(p_slot);
                 break;
         default:
-                warn("Not a valid state\n");
+                ctrl_warn(ctrl, "Not a valid state\n");
                 break;
         }
 }
@@ -551,7 +565,7 @@ static void interrupt_event_handler(struct work_struct *work)
                 handle_button_press_event(p_slot);
                 break;
         case INT_POWER_FAULT:
-                dbg("%s: power fault\n", __func__);
+                ctrl_dbg(p_slot->ctrl, "%s: power fault\n", __func__);
                 p_slot->hpc_ops->set_attention_status(p_slot, 1);
                 p_slot->hpc_ops->green_led_off(p_slot);
                 break;
@@ -569,22 +583,24 @@ static int shpchp_enable_slot (struct slot *p_slot)
 {
         u8 getstatus = 0;
         int rc, retval = -ENODEV;
+        struct controller *ctrl = p_slot->ctrl;
 
         /* Check to see if (latch closed, card present, power off) */
         mutex_lock(&p_slot->ctrl->crit_sect);
         rc = p_slot->hpc_ops->get_adapter_status(p_slot, &getstatus);
         if (rc || !getstatus) {
-                info("No adapter on slot(%s)\n", slot_name(p_slot));
+                ctrl_info(ctrl, "No adapter on slot(%s)\n", slot_name(p_slot));
                 goto out;
         }
         rc = p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
         if (rc || getstatus) {
-                info("Latch open on slot(%s)\n", slot_name(p_slot));
+                ctrl_info(ctrl, "Latch open on slot(%s)\n", slot_name(p_slot));
                 goto out;
         }
         rc = p_slot->hpc_ops->get_power_status(p_slot, &getstatus);
         if (rc || getstatus) {
-                info("Already enabled on slot(%s)\n", slot_name(p_slot));
+                ctrl_info(ctrl, "Already enabled on slot(%s)\n",
+                          slot_name(p_slot));
                 goto out;
         }
 
@@ -593,7 +609,7 @@ static int shpchp_enable_slot (struct slot *p_slot)
         /* We have to save the presence info for these slots */
         p_slot->hpc_ops->get_adapter_status(p_slot, &(p_slot->presence_save));
         p_slot->hpc_ops->get_power_status(p_slot, &(p_slot->pwr_save));
-        dbg("%s: p_slot->pwr_save %x\n", __func__, p_slot->pwr_save);
+        ctrl_dbg(ctrl, "%s: p_slot->pwr_save %x\n", __func__, p_slot->pwr_save);
         p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
 
         if(((p_slot->ctrl->pci_dev->vendor == PCI_VENDOR_ID_AMD) ||
@@ -624,6 +640,7 @@ static int shpchp_disable_slot (struct slot *p_slot)
 {
         u8 getstatus = 0;
         int rc, retval = -ENODEV;
+        struct controller *ctrl = p_slot->ctrl;
 
         if (!p_slot->ctrl)
                 return -ENODEV;
@@ -633,17 +650,18 @@ static int shpchp_disable_slot (struct slot *p_slot)
 
         rc = p_slot->hpc_ops->get_adapter_status(p_slot, &getstatus);
         if (rc || !getstatus) {
-                info("No adapter on slot(%s)\n", slot_name(p_slot));
+                ctrl_info(ctrl, "No adapter on slot(%s)\n", slot_name(p_slot));
                 goto out;
         }
         rc = p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
         if (rc || getstatus) {
-                info("Latch open on slot(%s)\n", slot_name(p_slot));
+                ctrl_info(ctrl, "Latch open on slot(%s)\n", slot_name(p_slot));
                 goto out;
         }
         rc = p_slot->hpc_ops->get_power_status(p_slot, &getstatus);
         if (rc || !getstatus) {
-                info("Already disabled slot(%s)\n", slot_name(p_slot));
+                ctrl_info(ctrl, "Already disabled slot(%s)\n",
+                          slot_name(p_slot));
                 goto out;
         }
 
@@ -657,6 +675,7 @@ static int shpchp_disable_slot (struct slot *p_slot)
 int shpchp_sysfs_enable_slot(struct slot *p_slot)
 {
         int retval = -ENODEV;
+        struct controller *ctrl = p_slot->ctrl;
 
         mutex_lock(&p_slot->lock);
         switch (p_slot->state) {
@@ -670,15 +689,17 @@ int shpchp_sysfs_enable_slot(struct slot *p_slot)
                 p_slot->state = STATIC_STATE;
                 break;
         case POWERON_STATE:
-                info("Slot %s is already in powering on state\n",
-                     slot_name(p_slot));
+                ctrl_info(ctrl, "Slot %s is already in powering on state\n",
+                          slot_name(p_slot));
                 break;
         case BLINKINGOFF_STATE:
         case POWEROFF_STATE:
-                info("Already enabled on slot %s\n", slot_name(p_slot));
+                ctrl_info(ctrl, "Already enabled on slot %s\n",
+                          slot_name(p_slot));
                 break;
         default:
-                err("Not a valid state on slot %s\n", slot_name(p_slot));
+                ctrl_err(ctrl, "Not a valid state on slot %s\n",
+                         slot_name(p_slot));
                 break;
         }
         mutex_unlock(&p_slot->lock);
@@ -689,6 +710,7 @@ int shpchp_sysfs_enable_slot(struct slot *p_slot)
 int shpchp_sysfs_disable_slot(struct slot *p_slot)
 {
         int retval = -ENODEV;
+        struct controller *ctrl = p_slot->ctrl;
 
         mutex_lock(&p_slot->lock);
         switch (p_slot->state) {
@@ -702,15 +724,17 @@ int shpchp_sysfs_disable_slot(struct slot *p_slot)
                 p_slot->state = STATIC_STATE;
                 break;
         case POWEROFF_STATE:
-                info("Slot %s is already in powering off state\n",
-                     slot_name(p_slot));
+                ctrl_info(ctrl, "Slot %s is already in powering off state\n",
+                          slot_name(p_slot));
                 break;
         case BLINKINGON_STATE:
         case POWERON_STATE:
-                info("Already disabled on slot %s\n", slot_name(p_slot));
+                ctrl_info(ctrl, "Already disabled on slot %s\n",
+                          slot_name(p_slot));
                 break;
         default:
-                err("Not a valid state on slot %s\n", slot_name(p_slot));
+                ctrl_err(ctrl, "Not a valid state on slot %s\n",
+                         slot_name(p_slot));
                 break;
         }
         mutex_unlock(&p_slot->lock);