diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 16:50:36 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 16:50:36 +0400 |
| commit | 94f8c66e5e543d79231abf203d6e514ecb668688 (patch) | |
| tree | 79f240cb13dd3da5879a7cf52ca1beca4650311d /drivers/scsi/sata_svw.c | |
| parent | da1f136c26d45c57e8b2d711bf17a6e5ec4de2d1 (diff) | |
| parent | d0bd99299bf933ae006d2dc6a31ffcba482ae3f2 (diff) | |
| download | linux-94f8c66e5e543d79231abf203d6e514ecb668688.tar.xz | |
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Diffstat (limited to 'drivers/scsi/sata_svw.c')
| -rw-r--r-- | drivers/scsi/sata_svw.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/scsi/sata_svw.c b/drivers/scsi/sata_svw.c index 19d3bb3b0fb6..d89d968bedac 100644 --- a/drivers/scsi/sata_svw.c +++ b/drivers/scsi/sata_svw.c @@ -318,7 +318,7 @@ static struct ata_port_operations k2_sata_ops = { .scr_write = k2_sata_scr_write, .port_start = ata_port_start, .port_stop = ata_port_stop, - .host_stop = ata_host_stop, + .host_stop = ata_pci_host_stop, }; static void k2_sata_setup_port(struct ata_ioports *port, unsigned long base) @@ -346,7 +346,7 @@ static int k2_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *e static int printed_version; struct ata_probe_ent *probe_ent = NULL; unsigned long base; - void *mmio_base; + void __iomem *mmio_base; int pci_dev_busy = 0; int rc; int i; @@ -392,8 +392,7 @@ static int k2_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *e probe_ent->dev = pci_dev_to_dev(pdev); INIT_LIST_HEAD(&probe_ent->node); - mmio_base = ioremap(pci_resource_start(pdev, 5), - pci_resource_len(pdev, 5)); + mmio_base = pci_iomap(pdev, 5, 0); if (mmio_base == NULL) { rc = -ENOMEM; goto err_out_free_ent; |