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_cypress.c
diff --git
a/drivers/ata/pata_cypress.c
b/drivers/ata/pata_cypress.c
index 6ec049c3b1dcf4e0fbe03b374a0d17f69672a405..cae44250d81429ff381fee010be11affa1efb3e2 100644
(file)
--- a/
drivers/ata/pata_cypress.c
+++ b/
drivers/ata/pata_cypress.c
@@
-18,7
+18,7
@@
#include <linux/libata.h>
#define DRV_NAME "pata_cypress"
#include <linux/libata.h>
#define DRV_NAME "pata_cypress"
-#define DRV_VERSION "0.1.
4
"
+#define DRV_VERSION "0.1.
5
"
/* here are the offset definitions for the registers */
/* here are the offset definitions for the registers */
@@
-125,14
+125,9
@@
static struct scsi_host_template cy82c693_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 cy82c693_port_ops = {
};
static struct ata_port_operations cy82c693_port_ops = {
- .port_disable = ata_port_disable,
.set_piomode = cy82c693_set_piomode,
.set_dmamode = cy82c693_set_dmamode,
.mode_filter = ata_pci_default_filter,
.set_piomode = cy82c693_set_piomode,
.set_dmamode = cy82c693_set_dmamode,
.mode_filter = ata_pci_default_filter,
@@
-162,21
+157,20
@@
static struct ata_port_operations cy82c693_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 cy82c693_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
{
.port_start = ata_port_start,
};
static int cy82c693_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
{
- static struct ata_port_info info = {
+ static
const
struct ata_port_info info = {
.sht = &cy82c693_sht,
.sht = &cy82c693_sht,
- .flags = ATA_FLAG_SLAVE_POSS
| ATA_FLAG_SRST
,
+ .flags = ATA_FLAG_SLAVE_POSS,
.pio_mask = 0x1f,
.mwdma_mask = 0x07,
.port_ops = &cy82c693_port_ops
};
.pio_mask = 0x1f,
.mwdma_mask = 0x07,
.port_ops = &cy82c693_port_ops
};
-
static struct ata_port_info *port_info[1] = { &
info };
+
const struct ata_port_info *ppi[] = { &info, &ata_dummy_port_
info };
/* Devfn 1 is the ATA primary. The secondary is magic and on devfn2.
For the moment we don't handle the secondary. FIXME */
/* Devfn 1 is the ATA primary. The secondary is magic and on devfn2.
For the moment we don't handle the secondary. FIXME */
@@
-184,7
+178,7
@@
static int cy82c693_init_one(struct pci_dev *pdev, const struct pci_device_id *i
if (PCI_FUNC(pdev->devfn) != 1)
return -ENODEV;
if (PCI_FUNC(pdev->devfn) != 1)
return -ENODEV;
- return ata_pci_init_one(pdev, p
ort_info, 1
);
+ return ata_pci_init_one(pdev, p
pi
);
}
static const struct pci_device_id cy82c693[] = {
}
static const struct pci_device_id cy82c693[] = {