From ab3ea5bf37e7189e843e19e500e7af50e802b5f6 Mon Sep 17 00:00:00 2001 From: Matthew Wilcox Date: Mon, 6 May 2013 08:22:18 -0400 Subject: NVMe: Simplify Firmware Activate code slightly Add definitions for the three Firmware Activate actions, and change the SCSI translation code to construct the command into a temporary variable instead of translating the endianness back-and-forth. Signed-off-by: Matthew Wilcox Reviewed-by: Vishal Verma --- drivers/block/nvme-scsi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'drivers/block') diff --git a/drivers/block/nvme-scsi.c b/drivers/block/nvme-scsi.c index 1c0710c..fed54b0 100644 --- a/drivers/block/nvme-scsi.c +++ b/drivers/block/nvme-scsi.c @@ -1577,10 +1577,8 @@ static int nvme_trans_send_fw_cmd(struct nvme_ns *ns, struct sg_io_hdr *hdr, c.dlfw.numd = cpu_to_le32((tot_len/BYTES_TO_DWORDS) - 1); c.dlfw.offset = cpu_to_le32(offset/BYTES_TO_DWORDS); } else if (opcode == nvme_admin_activate_fw) { - c.common.cdw10[0] = cpu_to_le32(buffer_id); - /* AA=01b Replace & activate at reset */ - c.common.cdw10[0] = cpu_to_le32(le32_to_cpu( - c.common.cdw10[0]) | 0x00000008); + u32 cdw10 = buffer_id | NVME_FWACT_REPL_ACTV; + c.common.cdw10[0] = cpu_to_le32(cdw10); } nvme_sc = nvme_submit_admin_cmd(dev, &c, NULL); -- cgit v1.1