From 16ab16ee6e19e820c1eeb0cf9aae408cc35197bc Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Thu, 26 Jun 2014 23:26:25 +0000 Subject: [PATCH] scst_vdisk: Three more put_unaligned_*() conversions Convert three more *(__be16 *)p = cpu_to_be16(v) statements into put_unaligned_be16(v, p) since the latter is easier to read. Also convert one "cmd->dev" into "dev" expression. This patch does not change any functionality. Signed-off-by: Bart Van Assche git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5626 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/dev_handlers/scst_vdisk.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c index a266550c2..df565181f 100644 --- a/scst/src/dev_handlers/scst_vdisk.c +++ b/scst/src/dev_handlers/scst_vdisk.c @@ -3407,8 +3407,7 @@ static int vdisk_block_limits(uint8_t *buf, struct scst_cmd *cmd, buf[4] = 1; /* WSNZ set */ buf[5] = 0xFF; /* No MAXIMUM COMPARE AND WRITE LENGTH limit */ /* Optimal transfer granuality is PAGE_SIZE */ - put_unaligned_be16(max_t(int, PAGE_SIZE / cmd->dev->block_size, 1), - &buf[6]); + put_unaligned_be16(max_t(int, PAGE_SIZE / dev->block_size, 1), &buf[6]); /* Max transfer len is min of sg limit and 8M */ max_transfer = min_t(int, cmd->tgt_dev->max_sg_cnt << PAGE_SHIFT, @@ -3531,15 +3530,16 @@ static int vdisk_inq(uint8_t *buf, struct scst_cmd *cmd, if (cmd->tgtt->get_phys_transport_version != NULL) { uint16_t v = cmd->tgtt->get_phys_transport_version(cmd->tgt); if (v != 0) { - *((__be16 *)&buf[58 + num]) = cpu_to_be16(v); + put_unaligned_be16(v, &buf[58 + num]); num += 2; } } /* SCSI transport */ if (cmd->tgtt->get_scsi_transport_version != NULL) { - *((__be16 *)&buf[58 + num]) = - cpu_to_be16(cmd->tgtt->get_scsi_transport_version(cmd->tgt)); + put_unaligned_be16( + cmd->tgtt->get_scsi_transport_version(cmd->tgt), + &buf[58 + num]); num += 2; } @@ -3550,8 +3550,8 @@ static int vdisk_inq(uint8_t *buf, struct scst_cmd *cmd, /* Device command set */ if (virt_dev->command_set_version != 0) { - *((__be16 *)&buf[58 + num]) = - cpu_to_be16(virt_dev->command_set_version); + put_unaligned_be16(virt_dev->command_set_version, + &buf[58 + num]); num += 2; }