firewire: consistent usage of node_id
Definitions as per IEEE 1212 and IEEE 1394:
Node ID: Concatenation of bus ID and local ID. 16 bits long.
Bus ID: Identifies a particular bus within a group of buses
interconnected by bus bridges.
Local ID: Identifies a particular node on a bus.
PHY ID: Local ID of IEEE 1394 nodes. 6 bits long.
Never ever use a variable called node_id for anything else than a node ID.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
index f5c4682..4e42b73 100644
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
@@ -328,7 +328,7 @@
spin_unlock_irqrestore(&device->card->lock, flags);
fw_send_request(device->card, &orb->t, TCODE_WRITE_BLOCK_REQUEST,
- node_id | LOCAL_BUS, generation,
+ node_id, generation,
device->node->max_speed, offset,
&orb->pointer, sizeof orb->pointer,
complete_transaction, orb);
@@ -485,7 +485,7 @@
return -ENOMEM;
fw_send_request(device->card, t, TCODE_WRITE_QUADLET_REQUEST,
- sd->node_id | LOCAL_BUS, sd->generation, SCODE_400,
+ sd->node_id, sd->generation, SCODE_400,
sd->command_block_agent_address + SBP2_AGENT_RESET,
&zero, sizeof zero, complete_agent_reset_write, t);
@@ -586,7 +586,7 @@
sd->generation = generation;
sd->node_id = node_id;
- sd->address_high = (LOCAL_BUS | local_node_id) << 16;
+ sd->address_high = local_node_id << 16;
/* Get command block agent offset and login id. */
sd->command_block_agent_address =
@@ -663,7 +663,7 @@
sd->generation = generation;
sd->node_id = node_id;
- sd->address_high = (LOCAL_BUS | local_node_id) << 16;
+ sd->address_high = local_node_id << 16;
}
static void sbp2_update(struct fw_unit *unit)