projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ipmi: Fix mem leak in try_init_dmi()
[profile/ivi/kernel-adaptation-intel-automotive.git]
/
drivers
/
ata
/
pata_opti.c
diff --git
a/drivers/ata/pata_opti.c
b/drivers/ata/pata_opti.c
index
13b63e2
..
458bf67
100644
(file)
--- a/
drivers/ata/pata_opti.c
+++ b/
drivers/ata/pata_opti.c
@@
-47,11
+47,12
@@
enum {
/**
* opti_pre_reset - probe begin
* @ap: ATA port
/**
* opti_pre_reset - probe begin
* @ap: ATA port
+ * @deadline: deadline jiffies for the operation
*
* Set up cable type and use generic probe init
*/
*
* Set up cable type and use generic probe init
*/
-static int opti_pre_reset(struct ata_port *ap)
+static int opti_pre_reset(struct ata_port *ap
, unsigned long deadline
)
{
struct pci_dev *pdev = to_pci_dev(ap->host->dev);
static const struct pci_bits opti_enable_bits[] = {
{
struct pci_dev *pdev = to_pci_dev(ap->host->dev);
static const struct pci_bits opti_enable_bits[] = {
@@
-61,7
+62,8
@@
static int opti_pre_reset(struct ata_port *ap)
if (!pci_test_config_bits(pdev, &opti_enable_bits[ap->port_no]))
return -ENOENT;
if (!pci_test_config_bits(pdev, &opti_enable_bits[ap->port_no]))
return -ENOENT;
- return ata_std_prereset(ap);
+
+ return ata_std_prereset(ap, deadline);
}
/**
}
/**
@@
-177,10
+179,6
@@
static struct scsi_host_template opti_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 opti_port_ops = {
};
static struct ata_port_operations opti_port_ops = {
@@
-218,19
+216,19
@@
static struct ata_port_operations opti_port_ops = {
static int opti_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{
static int opti_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 = &opti_sht,
.sht = &opti_sht,
- .flags = ATA_FLAG_SLAVE_POSS
| ATA_FLAG_SRST
,
+ .flags = ATA_FLAG_SLAVE_POSS,
.pio_mask = 0x1f,
.port_ops = &opti_port_ops
};
.pio_mask = 0x1f,
.port_ops = &opti_port_ops
};
-
static struct ata_port_info *port_info[2] = { &info, &info
};
+
const struct ata_port_info *ppi[] = { &info, NULL
};
static int printed_version;
if (!printed_version++)
dev_printk(KERN_DEBUG, &dev->dev, "version " DRV_VERSION "\n");
static int printed_version;
if (!printed_version++)
dev_printk(KERN_DEBUG, &dev->dev, "version " DRV_VERSION "\n");
- return ata_pci_init_one(dev, p
ort_info, 2
);
+ return ata_pci_init_one(dev, p
pi
);
}
static const struct pci_device_id opti[] = {
}
static const struct pci_device_id opti[] = {