firewire: core: prefix log messages with card name

[linux-2.6-microblaze.git] / drivers / firewire / core-topology.c

diff --git a/drivers/firewire/core-topology.c b/drivers/firewire/core-topology.c
index 94d3b49..75a6b0d 100644 (file)
--- a/drivers/firewire/core-topology.c
+++ b/drivers/firewire/core-topology.c
@@ -205,19 +205,19 @@ static struct fw_node *build_tree(struct fw_card *card,
                next_sid = count_ports(sid, &port_count, &child_port_count);
 
                if (next_sid == NULL) {
-                       fw_error("Inconsistent extended self IDs.\n");
+                       fw_err(card, "inconsistent extended self IDs\n");
                        return NULL;
                }
 
                q = *sid;
                if (phy_id != SELF_ID_PHY_ID(q)) {
-                       fw_error("PHY ID mismatch in self ID: %d != %d.\n",
-                                phy_id, SELF_ID_PHY_ID(q));
+                       fw_err(card, "PHY ID mismatch in self ID: %d != %d\n",
+                              phy_id, SELF_ID_PHY_ID(q));
                        return NULL;
                }
 
                if (child_port_count > stack_depth) {
-                       fw_error("Topology stack underflow\n");
+                       fw_err(card, "topology stack underflow\n");
                        return NULL;
                }
 
@@ -235,7 +235,7 @@ static struct fw_node *build_tree(struct fw_card *card,
 
                node = fw_node_create(q, port_count, card->color);
                if (node == NULL) {
-                       fw_error("Out of memory while building topology.\n");
+                       fw_err(card, "out of memory while building topology\n");
                        return NULL;
                }
 
@@ -284,8 +284,8 @@ static struct fw_node *build_tree(struct fw_card *card,
                 */
                if ((next_sid == end && parent_count != 0) ||
                    (next_sid < end && parent_count != 1)) {
-                       fw_error("Parent port inconsistency for node %d: "
-                                "parent_count=%d\n", phy_id, parent_count);
+                       fw_err(card, "parent port inconsistency for node %d: "
+                              "parent_count=%d\n", phy_id, parent_count);
                        return NULL;
                }
 
@@ -530,7 +530,7 @@ void fw_core_handle_bus_reset(struct fw_card *card, int node_id, int generation,
         */
        if (!is_next_generation(generation, card->generation) &&
            card->local_node != NULL) {
-               fw_notify("skipped bus generations, destroying all nodes\n");
+               fw_notice(card, "skipped bus generations, destroying all nodes\n");
                fw_destroy_nodes(card);
                card->bm_retries = 0;
        }
@@ -557,7 +557,7 @@ void fw_core_handle_bus_reset(struct fw_card *card, int node_id, int generation,
        card->color++;
 
        if (local_node == NULL) {
-               fw_error("topology build failed\n");
+               fw_err(card, "topology build failed\n");
                /* FIXME: We need to issue a bus reset in this case. */
        } else if (card->local_node == NULL) {
                card->local_node = local_node;