aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2008-07-12 08:50:42 -0400
committerStefan Richter <stefanr@s5r6.in-berlin.de>2008-07-14 07:06:04 -0400
commitb9549bc6803d6a16fe6a85b316b742ef82bd3931 (patch)
tree5ff7db7f309cc45b0f3c29c6e9a79cc2c01f2dd0
parente9aeb46c93a8b1b703d00586c05d9a71aa7e0f0c (diff)
firewire: small fw_fill_request cleanup
- better name for a function argument - removal of a local variable which became unnecessary after "fully initialize fw_transaction before marking it pending" Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
-rw-r--r--drivers/firewire/fw-transaction.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c
index 7addfb3b070b..861dd60de7d9 100644
--- a/drivers/firewire/fw-transaction.c
+++ b/drivers/firewire/fw-transaction.c
@@ -151,7 +151,7 @@ transmit_complete_callback(struct fw_packet *packet,
151 151
152static void 152static void
153fw_fill_request(struct fw_packet *packet, int tcode, int tlabel, 153fw_fill_request(struct fw_packet *packet, int tcode, int tlabel,
154 int node_id, int source_id, int generation, int speed, 154 int destination_id, int source_id, int generation, int speed,
155 unsigned long long offset, void *payload, size_t length) 155 unsigned long long offset, void *payload, size_t length)
156{ 156{
157 int ext_tcode; 157 int ext_tcode;
@@ -166,7 +166,7 @@ fw_fill_request(struct fw_packet *packet, int tcode, int tlabel,
166 HEADER_RETRY(RETRY_X) | 166 HEADER_RETRY(RETRY_X) |
167 HEADER_TLABEL(tlabel) | 167 HEADER_TLABEL(tlabel) |
168 HEADER_TCODE(tcode) | 168 HEADER_TCODE(tcode) |
169 HEADER_DESTINATION(node_id); 169 HEADER_DESTINATION(destination_id);
170 packet->header[1] = 170 packet->header[1] =
171 HEADER_OFFSET_HIGH(offset >> 32) | HEADER_SOURCE(source_id); 171 HEADER_OFFSET_HIGH(offset >> 32) | HEADER_SOURCE(source_id);
172 packet->header[2] = 172 packet->header[2] =
@@ -252,7 +252,7 @@ fw_send_request(struct fw_card *card, struct fw_transaction *t,
252 fw_transaction_callback_t callback, void *callback_data) 252 fw_transaction_callback_t callback, void *callback_data)
253{ 253{
254 unsigned long flags; 254 unsigned long flags;
255 int tlabel, source; 255 int tlabel;
256 256
257 /* 257 /*
258 * Bump the flush timer up 100ms first of all so we 258 * Bump the flush timer up 100ms first of all so we
@@ -268,7 +268,6 @@ fw_send_request(struct fw_card *card, struct fw_transaction *t,
268 268
269 spin_lock_irqsave(&card->lock, flags); 269 spin_lock_irqsave(&card->lock, flags);
270 270
271 source = card->node_id;
272 tlabel = card->current_tlabel; 271 tlabel = card->current_tlabel;
273 if (card->tlabel_mask & (1 << tlabel)) { 272 if (card->tlabel_mask & (1 << tlabel)) {
274 spin_unlock_irqrestore(&card->lock, flags); 273 spin_unlock_irqrestore(&card->lock, flags);
@@ -284,9 +283,8 @@ fw_send_request(struct fw_card *card, struct fw_transaction *t,
284 t->callback = callback; 283 t->callback = callback;
285 t->callback_data = callback_data; 284 t->callback_data = callback_data;
286 285
287 fw_fill_request(&t->packet, tcode, t->tlabel, 286 fw_fill_request(&t->packet, tcode, t->tlabel, node_id, card->node_id,
288 node_id, source, generation, 287 generation, speed, offset, payload, length);
289 speed, offset, payload, length);
290 t->packet.callback = transmit_complete_callback; 288 t->packet.callback = transmit_complete_callback;
291 289
292 list_add_tail(&t->link, &card->transaction_list); 290 list_add_tail(&t->link, &card->transaction_list);