PCI hotplug: shpchp: message refinement

[linux-2.6-omap-h63xx.git] / drivers / pci / hotplug / shpchp_ctrl.c

diff --git a/drivers/pci/hotplug/shpchp_ctrl.c b/drivers/pci/hotplug/shpchp_ctrl.c
index c9049f17864eb731bbef448c6a70e3a08859ecaa..b8ab2796e66af83d42dc3f2112f7bd3ca6a651bf 100644 (file)
--- 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 */
-       ctrl_dbg(ctrl, "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));
@@ -86,13 +86,13 @@ u8 shpchp_handle_switch_change(u8 hp_slot, struct controller *ctrl)
        u32 event_type;
 
        /* Switch Change */
-       ctrl_dbg(ctrl, "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);
-       ctrl_dbg(ctrl, "%s: Card present %x Power status %x\n",
-                __func__, p_slot->presence_save, p_slot->pwr_save);
+       ctrl_dbg(ctrl, "Card present %x Power status %x\n",
+                p_slot->presence_save, p_slot->pwr_save);
 
        if (getstatus) {
                /*
@@ -123,7 +123,7 @@ u8 shpchp_handle_presence_change(u8 hp_slot, struct controller *ctrl)
        u32 event_type;
 
        /* Presence Change */
-       ctrl_dbg(ctrl, "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);
 
@@ -158,7 +158,7 @@ u8 shpchp_handle_power_fault(u8 hp_slot, struct controller *ctrl)
        u32 event_type;
 
        /* Power fault */
-       ctrl_dbg(ctrl, "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);
 
@@ -178,7 +178,7 @@ u8 shpchp_handle_power_fault(u8 hp_slot, struct controller *ctrl)
                event_type = INT_POWER_FAULT;
                /* set power fault status for this board */
                p_slot->status = 0xFF;
-               ctrl_info(ctrl, "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);
@@ -194,7 +194,7 @@ static int change_bus_speed(struct controller *ctrl, struct slot *p_slot,
 {
        int rc = 0;
 
-       ctrl_dbg(ctrl, "%s: change to speed %d\n", __func__, speed);
+       ctrl_dbg(ctrl, "Change speed to %d\n", speed);
        if ((rc = p_slot->hpc_ops->set_bus_speed_mode(p_slot, speed))) {
                ctrl_err(ctrl, "%s: Issue of set bus speed mode command "
                         "failed\n", __func__);
@@ -215,8 +215,8 @@ static int fix_bus_speed(struct controller *ctrl, struct slot *pslot,
         */
        if (flag) {
                if (asp < bsp) {
-                       ctrl_err(ctrl, "%s: speed of bus %x and adapter %x "
-                                "mismatch\n", __func__, bsp, asp);
+                       ctrl_err(ctrl, "Speed of bus %x and adapter %x "
+                                "mismatch\n", bsp, asp);
                        rc = WRONG_BUS_FREQUENCY;
                }
                return rc;
@@ -246,6 +246,7 @@ static int board_added(struct slot *p_slot)
        int rc = 0;
        enum pci_bus_speed asp, bsp, msp;
        struct controller *ctrl = p_slot->ctrl;
+       struct pci_bus *parent = ctrl->pci_dev->subordinate;
 
        hp_slot = p_slot->device - ctrl->slot_device_offset;
 
@@ -256,7 +257,7 @@ static int board_added(struct slot *p_slot)
        /* Power on slot without connecting to bus */
        rc = p_slot->hpc_ops->power_on_slot(p_slot);
        if (rc) {
-               ctrl_err(ctrl, "%s: Failed to power on slot\n", __func__);
+               ctrl_err(ctrl, "Failed to power on slot\n");
                return -1;
        }
 
@@ -272,29 +273,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))) {
-                       ctrl_err(ctrl, "%s: Issue of Slot Enable command"
-                                " failed\n", __func__);
+                       ctrl_err(ctrl, "Issue of Slot Enable command failed\n");
                        return rc;
                }
        }
 
        rc = p_slot->hpc_ops->get_adapter_speed(p_slot, &asp);
        if (rc) {
-               ctrl_err(ctrl, "%s: Can't get adapter speed or bus mode "
-                        "mismatch\n", __func__);
+               ctrl_err(ctrl, "Can't get adapter speed or "
+                        "bus mode mismatch\n");
                return WRONG_BUS_FREQUENCY;
        }
 
        rc = p_slot->hpc_ops->get_cur_bus_speed(p_slot, &bsp);
        if (rc) {
-               ctrl_err(ctrl, "%s: Can't get bus operation speed\n", __func__);
+               ctrl_err(ctrl, "Can't get bus operation speed\n");
                return WRONG_BUS_FREQUENCY;
        }
 
        rc = p_slot->hpc_ops->get_max_bus_speed(p_slot, &msp);
        if (rc) {
-               ctrl_err(ctrl, "%s: Can't get max bus operation speed\n",
-                        __func__);
+               ctrl_err(ctrl, "Can't get max bus operation speed\n");
                msp = bsp;
        }
 
@@ -312,8 +311,7 @@ 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))) {
-               ctrl_err(ctrl, "%s: Issue of Slot Enable command failed\n",
-                        __func__);
+               ctrl_err(ctrl, "Issue of Slot Enable command failed\n");
                return rc;
        }
 
@@ -324,15 +322,15 @@ static int board_added(struct slot *p_slot)
        /* Check for a power fault */
        if (p_slot->status == 0xFF) {
                /* power fault occurred, but it was benign */
-               ctrl_dbg(ctrl, "%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)) {
-               ctrl_err(ctrl, "Cannot add device at 0x%x:0x%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;
        }
 
@@ -373,7 +371,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);
 
-       ctrl_dbg(ctrl, "In %s, hp_slot = %d\n", __func__, hp_slot);
+       ctrl_dbg(ctrl, "%s: hp_slot = %d\n", __func__, hp_slot);
 
        /* Change status to shutdown */
        if (p_slot->is_a_board)
@@ -389,8 +387,7 @@ static int remove_board(struct slot *p_slot)
 
        rc = p_slot->hpc_ops->set_attention_status(p_slot, 0);
        if (rc) {
-               ctrl_err(ctrl, "%s: Issue of Set Attention command failed\n",
-                        __func__);
+               ctrl_err(ctrl, "Issue of Set Attention command failed\n");
                return rc;
        }
 
@@ -526,7 +523,6 @@ static void handle_button_press_event(struct slot *p_slot)
                 */
                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);
@@ -565,7 +561,7 @@ static void interrupt_event_handler(struct work_struct *work)
                handle_button_press_event(p_slot);
                break;
        case INT_POWER_FAULT:
-               ctrl_dbg(p_slot->ctrl, "%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;
@@ -660,7 +656,7 @@ static int shpchp_disable_slot (struct slot *p_slot)
        }
        rc = p_slot->hpc_ops->get_power_status(p_slot, &getstatus);
        if (rc || !getstatus) {
-               ctrl_info(ctrl, "Already disabled slot(%s)\n",
+               ctrl_info(ctrl, "Already disabled on slot(%s)\n",
                          slot_name(p_slot));
                goto out;
        }