aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Boot <[email protected]>2012-12-11 21:58:47 +0000
committerNicholas Bellinger <[email protected]>2012-12-12 21:16:47 -0800
commit37419d674ca99739dbee5ada28b50aacc29c94e1 (patch)
tree727a2b2faf812f9d8d3c36398a88f213f3248ed4
parented72a4d52add345595f09b360d6ac5f20428d361 (diff)
sbp-target: use simple assignment in tgt_agent_rw_agent_state()
There is no need to memcpy() a 32-bit integer. The data pointer is guaranteed to be quadlet aligned by the FireWire stack so we can replace the memcpy() with an assignment. Thanks to Stefan Richter. Signed-off-by: Chris Boot <[email protected]> Cc: Stefan Richter <[email protected]> Cc: Andy Grover <[email protected]> Cc: Clemens Ladisch <[email protected]> Cc: Nicholas A. Bellinger <[email protected]> Signed-off-by: Nicholas Bellinger <[email protected]>
-rw-r--r--drivers/target/sbp/sbp_target.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
index 0d6d7c1f025e..f0a2a1d982a2 100644
--- a/drivers/target/sbp/sbp_target.c
+++ b/drivers/target/sbp/sbp_target.c
@@ -704,16 +704,17 @@ static void session_maintenance_work(struct work_struct *work)
static int tgt_agent_rw_agent_state(struct fw_card *card, int tcode, void *data,
struct sbp_target_agent *agent)
{
- __be32 state;
+ int state;
switch (tcode) {
case TCODE_READ_QUADLET_REQUEST:
pr_debug("tgt_agent AGENT_STATE READ\n");
spin_lock_bh(&agent->lock);
- state = cpu_to_be32(agent->state);
+ state = agent->state;
spin_unlock_bh(&agent->lock);
- memcpy(data, &state, sizeof(state));
+
+ *(__be32 *)data = cpu_to_be32(state);
return RCODE_COMPLETE;