aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firewire/sbp2.c
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2010-06-12 14:29:07 -0400
committerStefan Richter <stefanr@s5r6.in-berlin.de>2010-06-19 07:01:40 -0400
commite847cc832bab50aad939a0c30414cd986637564d (patch)
tree35b5d7af3e3f3337b8f7c9c43029618bec3a1f69 /drivers/firewire/sbp2.c
parent65b2742ac002f554f6ca0c2eab84cc62400eafdf (diff)
firewire: drop sizeof expressions from some request size arguments
In case of fw_card_bm_work()'s lock request, the present sizeof expression is going to be wrong if somebody changes the fw_card's DMA scratch buffer's size in the future. In case of quadlet write requests, sizeof(u32) is just silly; it's 4. In case of SBP-2 ORB pointer write requests, 8 is arguably quicker to understand as the correct and only possible value than sizeof(some_datum). Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire/sbp2.c')
-rw-r--r--drivers/firewire/sbp2.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/firewire/sbp2.c b/drivers/firewire/sbp2.c
index 7e33b0b1704c..ae715c82da2e 100644
--- a/drivers/firewire/sbp2.c
+++ b/drivers/firewire/sbp2.c
@@ -508,8 +508,7 @@ static void sbp2_send_orb(struct sbp2_orb *orb, struct sbp2_logical_unit *lu,
508 508
509 fw_send_request(device->card, &orb->t, TCODE_WRITE_BLOCK_REQUEST, 509 fw_send_request(device->card, &orb->t, TCODE_WRITE_BLOCK_REQUEST,
510 node_id, generation, device->max_speed, offset, 510 node_id, generation, device->max_speed, offset,
511 &orb->pointer, sizeof(orb->pointer), 511 &orb->pointer, 8, complete_transaction, orb);
512 complete_transaction, orb);
513} 512}
514 513
515static int sbp2_cancel_orbs(struct sbp2_logical_unit *lu) 514static int sbp2_cancel_orbs(struct sbp2_logical_unit *lu)
@@ -654,7 +653,7 @@ static void sbp2_agent_reset(struct sbp2_logical_unit *lu)
654 fw_run_transaction(device->card, TCODE_WRITE_QUADLET_REQUEST, 653 fw_run_transaction(device->card, TCODE_WRITE_QUADLET_REQUEST,
655 lu->tgt->node_id, lu->generation, device->max_speed, 654 lu->tgt->node_id, lu->generation, device->max_speed,
656 lu->command_block_agent_address + SBP2_AGENT_RESET, 655 lu->command_block_agent_address + SBP2_AGENT_RESET,
657 &d, sizeof(d)); 656 &d, 4);
658} 657}
659 658
660static void complete_agent_reset_write_no_wait(struct fw_card *card, 659static void complete_agent_reset_write_no_wait(struct fw_card *card,
@@ -676,7 +675,7 @@ static void sbp2_agent_reset_no_wait(struct sbp2_logical_unit *lu)
676 fw_send_request(device->card, t, TCODE_WRITE_QUADLET_REQUEST, 675 fw_send_request(device->card, t, TCODE_WRITE_QUADLET_REQUEST,
677 lu->tgt->node_id, lu->generation, device->max_speed, 676 lu->tgt->node_id, lu->generation, device->max_speed,
678 lu->command_block_agent_address + SBP2_AGENT_RESET, 677 lu->command_block_agent_address + SBP2_AGENT_RESET,
679 &d, sizeof(d), complete_agent_reset_write_no_wait, t); 678 &d, 4, complete_agent_reset_write_no_wait, t);
680} 679}
681 680
682static inline void sbp2_allow_block(struct sbp2_logical_unit *lu) 681static inline void sbp2_allow_block(struct sbp2_logical_unit *lu)
@@ -866,8 +865,7 @@ static void sbp2_set_busy_timeout(struct sbp2_logical_unit *lu)
866 865
867 fw_run_transaction(device->card, TCODE_WRITE_QUADLET_REQUEST, 866 fw_run_transaction(device->card, TCODE_WRITE_QUADLET_REQUEST,
868 lu->tgt->node_id, lu->generation, device->max_speed, 867 lu->tgt->node_id, lu->generation, device->max_speed,
869 CSR_REGISTER_BASE + CSR_BUSY_TIMEOUT, 868 CSR_REGISTER_BASE + CSR_BUSY_TIMEOUT, &d, 4);
870 &d, sizeof(d));
871} 869}
872 870
873static void sbp2_reconnect(struct work_struct *work); 871static void sbp2_reconnect(struct work_struct *work);