diff options
Diffstat (limited to 'drivers/scsi/advansys.c')
-rw-r--r-- | drivers/scsi/advansys.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c index 399fe559e4d..7507d8bc57a 100644 --- a/drivers/scsi/advansys.c +++ b/drivers/scsi/advansys.c | |||
@@ -2527,7 +2527,7 @@ static void asc_prt_scsi_host(struct Scsi_Host *s) | |||
2527 | { | 2527 | { |
2528 | struct asc_board *boardp = shost_priv(s); | 2528 | struct asc_board *boardp = shost_priv(s); |
2529 | 2529 | ||
2530 | printk("Scsi_Host at addr 0x%p, device %s\n", s, boardp->dev->bus_id); | 2530 | printk("Scsi_Host at addr 0x%p, device %s\n", s, dev_name(boardp->dev)); |
2531 | printk(" host_busy %u, host_no %d, last_reset %d,\n", | 2531 | printk(" host_busy %u, host_no %d, last_reset %d,\n", |
2532 | s->host_busy, s->host_no, (unsigned)s->last_reset); | 2532 | s->host_busy, s->host_no, (unsigned)s->last_reset); |
2533 | 2533 | ||
@@ -13425,8 +13425,7 @@ static int __devinit advansys_board_found(struct Scsi_Host *shost, | |||
13425 | } | 13425 | } |
13426 | 13426 | ||
13427 | boardp->asc_n_io_port = pci_resource_len(pdev, 1); | 13427 | boardp->asc_n_io_port = pci_resource_len(pdev, 1); |
13428 | boardp->ioremap_addr = ioremap(pci_resource_start(pdev, 1), | 13428 | boardp->ioremap_addr = pci_ioremap_bar(pdev, 1); |
13429 | boardp->asc_n_io_port); | ||
13430 | if (!boardp->ioremap_addr) { | 13429 | if (!boardp->ioremap_addr) { |
13431 | shost_printk(KERN_ERR, shost, "ioremap(%lx, %d) " | 13430 | shost_printk(KERN_ERR, shost, "ioremap(%lx, %d) " |
13432 | "returned NULL\n", | 13431 | "returned NULL\n", |