summaryrefslogtreecommitdiff
path: root/drivers/scsi/BusLogic.c
diff options
context:
space:
mode:
authorKhalid Aziz <khalid.aziz@oracle.com>2013-05-16 19:44:14 -0600
committerJames Bottomley <JBottomley@Parallels.com>2013-06-26 18:32:47 -0700
commit391e2f25601e34a7d7e5dc155e487bc58dffd8c6 (patch)
tree11960063d6d30dfb69344a9aa955842542f59b8b /drivers/scsi/BusLogic.c
parent839cb99e8f748391059d10388c8aea48a88c142c (diff)
[SCSI] BusLogic: Port driver to 64-bit.
[jejb: fix up pointer to int cast warning] Signed-off-by: Khalid Aziz <khalid.aziz@oracle.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/BusLogic.c')
-rw-r--r--drivers/scsi/BusLogic.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c
index 6ec36d83af6c..feab3a5e50b5 100644
--- a/drivers/scsi/BusLogic.c
+++ b/drivers/scsi/BusLogic.c
@@ -1208,7 +1208,7 @@ static bool blogic_hwreset(struct blogic_adapter *adapter, bool hard_reset)
fpinfo->report_underrun = true;
adapter->cardhandle =
FlashPoint_HardwareResetHostAdapter(fpinfo);
- if (adapter->cardhandle == FPOINT_BADCARD_HANDLE)
+ if (adapter->cardhandle == (void *)FPOINT_BADCARD_HANDLE)
return false;
/*
Indicate the Host Adapter Hard Reset completed successfully.
@@ -2372,8 +2372,7 @@ static int __init blogic_init(void)
return -ENOMEM;
}
- adapter =
- kzalloc(sizeof(struct blogic_adapter), GFP_KERNEL);
+ adapter = kzalloc(sizeof(struct blogic_adapter), GFP_KERNEL);
if (adapter == NULL) {
kfree(blogic_probeinfo_list);
blogic_err("BusLogic: Unable to allocate Prototype Host Adapter\n", NULL);
@@ -3079,11 +3078,11 @@ static int blogic_qcmd_lck(struct scsi_cmnd *command,
ccb->opcode = BLOGIC_INITIATOR_CCB_SG;
ccb->datalen = count * sizeof(struct blogic_sg_seg);
if (blogic_multimaster_type(adapter))
- ccb->data = (unsigned int) ccb->dma_handle +
+ ccb->data = (void *)((unsigned int) ccb->dma_handle +
((unsigned long) &ccb->sglist -
- (unsigned long) ccb);
+ (unsigned long) ccb));
else
- ccb->data = virt_to_32bit_virt(ccb->sglist);
+ ccb->data = ccb->sglist;
scsi_for_each_sg(command, sg, count, i) {
ccb->sglist[i].segbytes = sg_dma_len(sg);