projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libata: add deadline support to prereset and reset methods
[powerpc.git]
/
drivers
/
ata
/
pata_efar.c
diff --git
a/drivers/ata/pata_efar.c
b/drivers/ata/pata_efar.c
index
a321685
..
d0f52e0
100644
(file)
--- a/
drivers/ata/pata_efar.c
+++ b/
drivers/ata/pata_efar.c
@@
-27,12
+27,13
@@
/**
* efar_pre_reset - Enable bits
* @ap: Port
/**
* efar_pre_reset - Enable bits
* @ap: Port
+ * @deadline: deadline jiffies for the operation
*
* Perform cable detection for the EFAR ATA interface. This is
* different to the PIIX arrangement
*/
*
* Perform cable detection for the EFAR ATA interface. This is
* different to the PIIX arrangement
*/
-static int efar_pre_reset(struct ata_port *ap)
+static int efar_pre_reset(struct ata_port *ap
, unsigned long deadline
)
{
static const struct pci_bits efar_enable_bits[] = {
{ 0x41U, 1U, 0x80UL, 0x80UL }, /* port 0 */
{
static const struct pci_bits efar_enable_bits[] = {
{ 0x41U, 1U, 0x80UL, 0x80UL }, /* port 0 */
@@
-43,7
+44,7
@@
static int efar_pre_reset(struct ata_port *ap)
if (!pci_test_config_bits(pdev, &efar_enable_bits[ap->port_no]))
return -ENOENT;
if (!pci_test_config_bits(pdev, &efar_enable_bits[ap->port_no]))
return -ENOENT;
- return ata_std_prereset(ap);
+ return ata_std_prereset(ap
, deadline
);
}
/**
}
/**