projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
md: remove the slash from the name of a kmem_cache used by raid5
[powerpc.git]
/
drivers
/
ata
/
ata_piix.c
diff --git
a/drivers/ata/ata_piix.c
b/drivers/ata/ata_piix.c
index
55d306a
..
4a795fd
100644
(file)
--- a/
drivers/ata/ata_piix.c
+++ b/
drivers/ata/ata_piix.c
@@
-625,17
+625,18
@@
static int ich_pata_cable_detect(struct ata_port *ap)
/**
* piix_pata_prereset - prereset for PATA host controller
* @ap: Target port
/**
* piix_pata_prereset - prereset for PATA host controller
* @ap: Target port
+ * @deadline: deadline jiffies for the operation
*
* LOCKING:
* None (inherited from caller).
*/
*
* LOCKING:
* None (inherited from caller).
*/
-static int piix_pata_prereset(struct ata_port *ap)
+static int piix_pata_prereset(struct ata_port *ap
, unsigned long deadline
)
{
struct pci_dev *pdev = to_pci_dev(ap->host->dev);
if (!pci_test_config_bits(pdev, &piix_enable_bits[ap->port_no]))
return -ENOENT;
{
struct pci_dev *pdev = to_pci_dev(ap->host->dev);
if (!pci_test_config_bits(pdev, &piix_enable_bits[ap->port_no]))
return -ENOENT;
- return ata_std_prereset(ap);
+ return ata_std_prereset(ap
, deadline
);
}
static void piix_pata_error_handler(struct ata_port *ap)
}
static void piix_pata_error_handler(struct ata_port *ap)
@@
-644,7
+645,6
@@
static void piix_pata_error_handler(struct ata_port *ap)
ata_std_postreset);
}
ata_std_postreset);
}
-
static void piix_sata_error_handler(struct ata_port *ap)
{
ata_bmdma_drive_eh(ap, ata_std_prereset, ata_std_softreset, NULL,
static void piix_sata_error_handler(struct ata_port *ap)
{
ata_bmdma_drive_eh(ap, ata_std_prereset, ata_std_softreset, NULL,