aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew@wil.cx>2007-10-02 21:55:42 -0400
committerJames Bottomley <jejb@mulgrave.localdomain>2007-10-12 14:54:13 -0400
commit9d511a4b29de6764931343d03e493f2e04df0271 (patch)
treeff43505ce900aa6923614354954633662855543f
parentd10fb2c7b5ce1b475df50cde9262d2c3fe3d296e (diff)
[SCSI] advansys: Changes to work on parisc
Change PortAddr to be an unsigned int instead of an unsigned short (IO Port address are 24 bit on parisc). Fix a couple of printk argument warnings. Remove the Kconfig marking as 'BROKEN'. I haven't removed the #warning yet because virt_to_bus/bus_to_virt are only eliminated for narrow boards. Wide boards need more work. Signed-off-by: Matthew Wilcox <willy@linux.intel.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r--drivers/scsi/Kconfig1
-rw-r--r--drivers/scsi/advansys.c10
2 files changed, 5 insertions, 6 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 69b2fac6f098..de6a6418df24 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -521,7 +521,6 @@ config SCSI_ADVANSYS
521 tristate "AdvanSys SCSI support" 521 tristate "AdvanSys SCSI support"
522 depends on SCSI 522 depends on SCSI
523 depends on ISA || EISA || PCI 523 depends on ISA || EISA || PCI
524 depends on BROKEN || X86_32
525 help 524 help
526 This is a driver for all SCSI host adapters manufactured by 525 This is a driver for all SCSI host adapters manufactured by
527 AdvanSys. It is documented in the kernel source in 526 AdvanSys. It is documented in the kernel source in
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 07507a7e9c50..9dd3952516c5 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -120,7 +120,7 @@ typedef unsigned char uchar;
120#define CC_VERY_LONG_SG_LIST 0 120#define CC_VERY_LONG_SG_LIST 0
121#define ASC_SRB2SCSIQ(srb_ptr) (srb_ptr) 121#define ASC_SRB2SCSIQ(srb_ptr) (srb_ptr)
122 122
123#define PortAddr unsigned short /* port address size */ 123#define PortAddr unsigned int /* port address size */
124#define inp(port) inb(port) 124#define inp(port) inb(port)
125#define outp(port, byte) outb((byte), (port)) 125#define outp(port, byte) outb((byte), (port))
126 126
@@ -13333,8 +13333,8 @@ static int __devinit advansys_wide_init_chip(struct Scsi_Host *shost)
13333 13333
13334 } 13334 }
13335 13335
13336 ASC_DBG(1, "sg_cnt %d * %u = %u bytes\n", sg_cnt, sizeof(adv_sgblk_t), 13336 ASC_DBG(1, "sg_cnt %d * %lu = %lu bytes\n", sg_cnt, sizeof(adv_sgblk_t),
13337 (unsigned)(sizeof(adv_sgblk_t) * sg_cnt)); 13337 sizeof(adv_sgblk_t) * sg_cnt);
13338 13338
13339 if (!board->adv_sgblkp) 13339 if (!board->adv_sgblkp)
13340 goto kmalloc_failed; 13340 goto kmalloc_failed;
@@ -13428,9 +13428,9 @@ static int __devinit advansys_board_found(struct Scsi_Host *shost,
13428 boardp->ioremap_addr = ioremap(pci_resource_start(pdev, 1), 13428 boardp->ioremap_addr = ioremap(pci_resource_start(pdev, 1),
13429 boardp->asc_n_io_port); 13429 boardp->asc_n_io_port);
13430 if (!boardp->ioremap_addr) { 13430 if (!boardp->ioremap_addr) {
13431 shost_printk(KERN_ERR, shost, "ioremap(%x, %d) " 13431 shost_printk(KERN_ERR, shost, "ioremap(%lx, %d) "
13432 "returned NULL\n", 13432 "returned NULL\n",
13433 pci_resource_start(pdev, 1), 13433 (long)pci_resource_start(pdev, 1),
13434 boardp->asc_n_io_port); 13434 boardp->asc_n_io_port);
13435 ret = -ENODEV; 13435 ret = -ENODEV;
13436 goto err_shost; 13436 goto err_shost;