aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2009-03-05 13:07:00 -0500
committerStefan Richter <stefanr@s5r6.in-berlin.de>2009-03-24 15:56:48 -0400
commitba27e1f7bf220799cd3d7503f82bda71b8ebe8c5 (patch)
tree0d08f399eae860e112f3031a09be674c679d9189
parente1eff7a393d4a4e3ad1cf65fcba899146840bfd2 (diff)
firewire: core: normalize a function argument name
It's called "payload" rather than "data" almost everywhere in fw-transaction.c. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
-rw-r--r--drivers/firewire/fw-transaction.c6
-rw-r--r--drivers/firewire/fw-transaction.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c
index 1537737e4420..76938fe432a0 100644
--- a/drivers/firewire/fw-transaction.c
+++ b/drivers/firewire/fw-transaction.c
@@ -317,15 +317,15 @@ static void transaction_callback(struct fw_card *card, int rcode,
317 */ 317 */
318int fw_run_transaction(struct fw_card *card, int tcode, int destination_id, 318int fw_run_transaction(struct fw_card *card, int tcode, int destination_id,
319 int generation, int speed, unsigned long long offset, 319 int generation, int speed, unsigned long long offset,
320 void *data, size_t length) 320 void *payload, size_t length)
321{ 321{
322 struct transaction_callback_data d; 322 struct transaction_callback_data d;
323 struct fw_transaction t; 323 struct fw_transaction t;
324 324
325 init_completion(&d.done); 325 init_completion(&d.done);
326 d.payload = data; 326 d.payload = payload;
327 fw_send_request(card, &t, tcode, destination_id, generation, speed, 327 fw_send_request(card, &t, tcode, destination_id, generation, speed,
328 offset, data, length, transaction_callback, &d); 328 offset, payload, length, transaction_callback, &d);
329 wait_for_completion(&d.done); 329 wait_for_completion(&d.done);
330 330
331 return d.rcode; 331 return d.rcode;
diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h
index 212a10293828..35d0a4bb6d5c 100644
--- a/drivers/firewire/fw-transaction.h
+++ b/drivers/firewire/fw-transaction.h
@@ -405,14 +405,14 @@ int fw_core_initiate_bus_reset(struct fw_card *card, int short_reset);
405 405
406void fw_send_request(struct fw_card *card, struct fw_transaction *t, 406void fw_send_request(struct fw_card *card, struct fw_transaction *t,
407 int tcode, int destination_id, int generation, int speed, 407 int tcode, int destination_id, int generation, int speed,
408 unsigned long long offset, void *data, size_t length, 408 unsigned long long offset, void *payload, size_t length,
409 fw_transaction_callback_t callback, void *callback_data); 409 fw_transaction_callback_t callback, void *callback_data);
410int fw_cancel_transaction(struct fw_card *card, 410int fw_cancel_transaction(struct fw_card *card,
411 struct fw_transaction *transaction); 411 struct fw_transaction *transaction);
412void fw_flush_transactions(struct fw_card *card); 412void fw_flush_transactions(struct fw_card *card);
413int fw_run_transaction(struct fw_card *card, int tcode, int destination_id, 413int fw_run_transaction(struct fw_card *card, int tcode, int destination_id,
414 int generation, int speed, unsigned long long offset, 414 int generation, int speed, unsigned long long offset,
415 void *data, size_t length); 415 void *payload, size_t length);
416void fw_send_phy_config(struct fw_card *card, 416void fw_send_phy_config(struct fw_card *card,
417 int node_id, int generation, int gap_count); 417 int node_id, int generation, int gap_count);
418 418