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 ebc58a907d26f3f8365961152a66fb9677182d54..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);
}
/**
}
/**
@@
-158,14
+159,9
@@
static struct scsi_host_template ns87410_sht = {
.slave_configure = ata_scsi_slave_config,
.slave_destroy = ata_scsi_slave_destroy,
.bios_param = ata_std_bios_param,
.slave_configure = ata_scsi_slave_config,
.slave_destroy = ata_scsi_slave_destroy,
.bios_param = ata_std_bios_param,
-#ifdef CONFIG_PM
- .resume = ata_scsi_device_resume,
- .suspend = ata_scsi_device_suspend,
-#endif
};
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,
@@
-188,21
+184,20
@@
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,
};
static int ns87410_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{
.port_start = ata_port_start,
};
static int ns87410_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{
- static struct ata_port_info info = {
+ static
const
struct ata_port_info info = {
.sht = &ns87410_sht,
.sht = &ns87410_sht,
- .flags = ATA_FLAG_SLAVE_POSS
| ATA_FLAG_SRST
,
+ .flags = ATA_FLAG_SLAVE_POSS,
.pio_mask = 0x0F,
.port_ops = &ns87410_port_ops
};
.pio_mask = 0x0F,
.port_ops = &ns87410_port_ops
};
-
static struct ata_port_info *port_info[2] = {&info, &info
};
- return ata_pci_init_one(dev, p
ort_info, 2
);
+
const struct ata_port_info *ppi[] = { &info, NULL
};
+ return ata_pci_init_one(dev, p
pi
);
}
static const struct pci_device_id ns87410[] = {
}
static const struct pci_device_id ns87410[] = {