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>
This commit is contained in:
Stefan Richter
2007-01-23 21:11:43 +01:00
parent 366f5f4fa3
commit 907293d788
6 changed files with 23 additions and 20 deletions

View File

@ -257,7 +257,7 @@ static int read_rom(struct fw_device *device, int index, u32 * data)
offset = 0xfffff0000400ULL + index * 4;
fw_send_request(device->card, &t, TCODE_READ_QUADLET_REQUEST,
device->node_id | LOCAL_BUS,
device->node_id,
device->generation, SCODE_100,
offset, NULL, 4, complete_transaction, &callback_data);
@ -447,7 +447,7 @@ static void fw_device_init(struct work_struct *work)
device->config_rom_retries++;
schedule_delayed_work(&device->work, RETRY_DELAY);
} else {
fw_notify("giving up on config rom for node id %d\n",
fw_notify("giving up on config rom for node id %x\n",
device->node_id);
fw_device_release(&device->device);
}