Fix 2.4 megaraid virt_to_bus() usage
Subsystems (2)
PATCH 1/1 Fix 2.4 megaraid virt_to_bus() usage
This has been in the ia64 patch for ages. It
- removes two unused variables,
- fixes a printk format string, and
- removes a virt_to_bus() that doesn't work on some ia64 boxes
The virt_to_bus() usage was removed from 2.6 in the upgrade to version 2.03 of the driver:
http://linux.bkbits.net:8080/linux-2.5/[email protected]?nav=index.html|src/.|src/drivers|src/drivers/scsi|related/drivers/scsi/megaraid.c
Please apply to 2.4.
Bjorn
drivers/scsi/megaraid.c +6 -5
@@ -2234,9 +2234,6 @@#if DEBUG -static unsigned int cum_time =0 ; -static unsigned int cum_time_cnt =0 ; -static void showMbox (mega_scb * pScb) {mega_mailbox *mbox;
@@ -2245,7 +2242,7 @@return ; mbox = (mega_mailbox *) pScb->mboxData; -printk ("%u cmd:%x id:%x #scts:%x lba:%x addr:%x logdrv:%x #sg:%x\n" , +printk ("%lu cmd:%x id:%x #scts:%x lba:%x addr:%x logdrv:%x #sg:%x\n" , pScb->SCpnt->pid, mbox->cmd, mbox->cmdid, mbox->numsectors, mbox->lba, mbox->xferaddr, mbox->logdrv, mbox->numsgelements);
@@ -3569,10 +3566,14 @@ mbox[0 ] =IS_BIOS_ENABLED ; mbox[2 ] =GET_BIOS ; - mboxpnt->xferaddr =virt_to_bus ((void *) megacfg->mega_buffer); + mboxpnt->xferaddr =pci_map_single (megacfg->dev, + (void *) megacfg->mega_buffer, (2 *1024L ), +PCI_DMA_FROMDEVICE ); ret =megaIssueCmd (megacfg, mbox,NULL ,0 ); +pci_unmap_single (megacfg->dev, mboxpnt->xferaddr,2 *1024L ,PCI_DMA_FROMDEVICE ); +return (*(char *) megacfg->mega_buffer); }