aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/megaraid
diff options
context:
space:
mode:
authoradam radford <aradford@gmail.com>2011-10-08 21:14:45 -0400
committerJames Bottomley <JBottomley@Parallels.com>2011-10-16 12:19:32 -0400
commit8d960d4311dc8d5f623d64694744b1ac36332e3f (patch)
treeff5d1c2f9ec882d12a6d897ab9d238e1fd19d998 /drivers/scsi/megaraid
parentd4a759a954072dcb0a0bbd64ec4bc5252182d032 (diff)
[SCSI] megaraid_sas: Remove some unnecessary code
Signed-off-by: Adam Radford <aradford@gmail.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/megaraid')
-rw-r--r--drivers/scsi/megaraid/megaraid_sas_fusion.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index 492ad42ff7ac..52f6a158477a 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -139,11 +139,6 @@ megasas_clear_intr_fusion(struct megasas_register_set __iomem *regs)
139 if (!(status & MFI_FUSION_ENABLE_INTERRUPT_MASK)) 139 if (!(status & MFI_FUSION_ENABLE_INTERRUPT_MASK))
140 return 0; 140 return 0;
141 141
142 /*
143 * dummy read to flush PCI
144 */
145 readl(&regs->outbound_intr_status);
146
147 return 1; 142 return 1;
148} 143}
149 144
@@ -590,7 +585,6 @@ megasas_ioc_init_fusion(struct megasas_instance *instance)
590 struct megasas_init_frame *init_frame; 585 struct megasas_init_frame *init_frame;
591 struct MPI2_IOC_INIT_REQUEST *IOCInitMessage; 586 struct MPI2_IOC_INIT_REQUEST *IOCInitMessage;
592 dma_addr_t ioc_init_handle; 587 dma_addr_t ioc_init_handle;
593 u32 context;
594 struct megasas_cmd *cmd; 588 struct megasas_cmd *cmd;
595 u8 ret; 589 u8 ret;
596 struct fusion_context *fusion; 590 struct fusion_context *fusion;
@@ -639,9 +633,6 @@ megasas_ioc_init_fusion(struct megasas_instance *instance)
639 memset(init_frame, 0, MEGAMFI_FRAME_SIZE); 633 memset(init_frame, 0, MEGAMFI_FRAME_SIZE);
640 634
641 frame_hdr = &cmd->frame->hdr; 635 frame_hdr = &cmd->frame->hdr;
642 context = init_frame->context;
643 init_frame->context = context;
644
645 frame_hdr->cmd_status = 0xFF; 636 frame_hdr->cmd_status = 0xFF;
646 frame_hdr->flags |= MFI_FRAME_DONT_POST_IN_REPLY_QUEUE; 637 frame_hdr->flags |= MFI_FRAME_DONT_POST_IN_REPLY_QUEUE;
647 638
@@ -1612,7 +1603,6 @@ megasas_build_and_issue_cmd_fusion(struct megasas_instance *instance,
1612 1603
1613 req_desc->Words = 0; 1604 req_desc->Words = 0;
1614 cmd->request_desc = req_desc; 1605 cmd->request_desc = req_desc;
1615 cmd->request_desc->Words = 0;
1616 1606
1617 if (megasas_build_io_fusion(instance, scmd, cmd)) { 1607 if (megasas_build_io_fusion(instance, scmd, cmd)) {
1618 megasas_return_cmd_fusion(instance, cmd); 1608 megasas_return_cmd_fusion(instance, cmd);
@@ -1928,15 +1918,12 @@ megasas_issue_dcmd_fusion(struct megasas_instance *instance,
1928 struct megasas_cmd *cmd) 1918 struct megasas_cmd *cmd)
1929{ 1919{
1930 union MEGASAS_REQUEST_DESCRIPTOR_UNION *req_desc; 1920 union MEGASAS_REQUEST_DESCRIPTOR_UNION *req_desc;
1931 union desc_value d_val;
1932 1921
1933 req_desc = build_mpt_cmd(instance, cmd); 1922 req_desc = build_mpt_cmd(instance, cmd);
1934 if (!req_desc) { 1923 if (!req_desc) {
1935 printk(KERN_ERR "Couldn't issue MFI pass thru cmd\n"); 1924 printk(KERN_ERR "Couldn't issue MFI pass thru cmd\n");
1936 return; 1925 return;
1937 } 1926 }
1938 d_val.word = req_desc->Words;
1939
1940 instance->instancet->fire_cmd(instance, req_desc->u.low, 1927 instance->instancet->fire_cmd(instance, req_desc->u.low,
1941 req_desc->u.high, instance->reg_set); 1928 req_desc->u.high, instance->reg_set);
1942} 1929}