projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[libata] Remove ->port_disable() hook
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
ata
/
pata_ns87410.c
diff --git
a/drivers/ata/pata_ns87410.c
b/drivers/ata/pata_ns87410.c
index 2f5d714ebfc4d5c7c844e2405e0ccb6b4bf3d193..4b0ddf6ba3ba3b1f3d482f41d7c69bf7295a05f3 100644
(file)
--- a/
drivers/ata/pata_ns87410.c
+++ b/
drivers/ata/pata_ns87410.c
@@
-32,14
+32,15
@@
/**
* ns87410_pre_reset - probe begin
/**
* ns87410_pre_reset - probe begin
- * @
ap: ATA port
+ * @
link: ATA link
* @deadline: deadline jiffies for the operation
*
* Check enabled ports
*/
* @deadline: deadline jiffies for the operation
*
* Check enabled ports
*/
-static int ns87410_pre_reset(struct ata_
port *ap
, unsigned long deadline)
+static int ns87410_pre_reset(struct ata_
link *link
, unsigned long deadline)
{
{
+ struct ata_port *ap = link->ap;
struct pci_dev *pdev = to_pci_dev(ap->host->dev);
static const struct pci_bits ns87410_enable_bits[] = {
{ 0x43, 1, 0x08, 0x08 },
struct pci_dev *pdev = to_pci_dev(ap->host->dev);
static const struct pci_bits ns87410_enable_bits[] = {
{ 0x43, 1, 0x08, 0x08 },
@@
-49,7
+50,7
@@
static int ns87410_pre_reset(struct ata_port *ap, unsigned long deadline)
if (!pci_test_config_bits(pdev, &ns87410_enable_bits[ap->port_no]))
return -ENOENT;
if (!pci_test_config_bits(pdev, &ns87410_enable_bits[ap->port_no]))
return -ENOENT;
- return ata_std_prereset(
ap
, deadline);
+ return ata_std_prereset(
link
, deadline);
}
/**
}
/**
@@
-161,7
+162,6
@@
static struct scsi_host_template ns87410_sht = {
};
static struct ata_port_operations ns87410_port_ops = {
};
static struct ata_port_operations ns87410_port_ops = {
- .port_disable = ata_port_disable,
.set_piomode = ns87410_set_piomode,
.tf_load = ata_tf_load,
.set_piomode = ns87410_set_piomode,
.tf_load = ata_tf_load,
@@
-184,7
+184,6
@@
static struct ata_port_operations ns87410_port_ops = {
.irq_handler = ata_interrupt,
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,
.irq_handler = ata_interrupt,
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,
- .irq_ack = ata_irq_ack,
.port_start = ata_port_start,
};
.port_start = ata_port_start,
};