projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libata: update libata LLDs to use devres
[powerpc.git]
/
drivers
/
ata
/
pata_marvell.c
diff --git
a/drivers/ata/pata_marvell.c
b/drivers/ata/pata_marvell.c
index
1c810ea
..
0a44095
100644
(file)
--- a/
drivers/ata/pata_marvell.c
+++ b/
drivers/ata/pata_marvell.c
@@
-45,10
+45,10
@@
static int marvell_pre_reset(struct ata_port *ap)
for(i = 0; i <= 0x0F; i++)
printk("%02X:%02X ", i, readb(barp + i));
printk("\n");
for(i = 0; i <= 0x0F; i++)
printk("%02X:%02X ", i, readb(barp + i));
printk("\n");
-
+
devices = readl(barp + 0x0C);
pci_iounmap(pdev, barp);
devices = readl(barp + 0x0C);
pci_iounmap(pdev, barp);
-
+
if ((pdev->device == 0x6145) && (ap->port_no == 0) &&
(!(devices & 0x10))) /* PATA enable ? */
return -ENOENT;
if ((pdev->device == 0x6145) && (ap->port_no == 0) &&
(!(devices & 0x10))) /* PATA enable ? */
return -ENOENT;
@@
-137,8
+137,6
@@
static const struct ata_port_operations marvell_ops = {
/* Generic PATA PCI ATA helpers */
.port_start = ata_port_start,
/* Generic PATA PCI ATA helpers */
.port_start = ata_port_start,
- .port_stop = ata_port_stop,
- .host_stop = ata_host_stop,
};
};