diff options
Diffstat (limited to 'drivers/ata/ata_piix.c')
-rw-r--r-- | drivers/ata/ata_piix.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index acffcf0b3ad3..174eca609b42 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
@@ -1270,7 +1270,7 @@ static int piix_disable_ahci(struct pci_dev *pdev) | |||
1270 | * they are found return an error code so we can turn off DMA | 1270 | * they are found return an error code so we can turn off DMA |
1271 | */ | 1271 | */ |
1272 | 1272 | ||
1273 | static int __devinit piix_check_450nx_errata(struct pci_dev *ata_dev) | 1273 | static int piix_check_450nx_errata(struct pci_dev *ata_dev) |
1274 | { | 1274 | { |
1275 | struct pci_dev *pdev = NULL; | 1275 | struct pci_dev *pdev = NULL; |
1276 | u16 cfg; | 1276 | u16 cfg; |
@@ -1296,8 +1296,8 @@ static int __devinit piix_check_450nx_errata(struct pci_dev *ata_dev) | |||
1296 | return no_piix_dma; | 1296 | return no_piix_dma; |
1297 | } | 1297 | } |
1298 | 1298 | ||
1299 | static void __devinit piix_init_pcs(struct ata_host *host, | 1299 | static void piix_init_pcs(struct ata_host *host, |
1300 | const struct piix_map_db *map_db) | 1300 | const struct piix_map_db *map_db) |
1301 | { | 1301 | { |
1302 | struct pci_dev *pdev = to_pci_dev(host->dev); | 1302 | struct pci_dev *pdev = to_pci_dev(host->dev); |
1303 | u16 pcs, new_pcs; | 1303 | u16 pcs, new_pcs; |
@@ -1313,9 +1313,9 @@ static void __devinit piix_init_pcs(struct ata_host *host, | |||
1313 | } | 1313 | } |
1314 | } | 1314 | } |
1315 | 1315 | ||
1316 | static const int *__devinit piix_init_sata_map(struct pci_dev *pdev, | 1316 | static const int *piix_init_sata_map(struct pci_dev *pdev, |
1317 | struct ata_port_info *pinfo, | 1317 | struct ata_port_info *pinfo, |
1318 | const struct piix_map_db *map_db) | 1318 | const struct piix_map_db *map_db) |
1319 | { | 1319 | { |
1320 | const int *map; | 1320 | const int *map; |
1321 | int i, invalid_map = 0; | 1321 | int i, invalid_map = 0; |
@@ -1392,7 +1392,7 @@ static bool piix_no_sidpr(struct ata_host *host) | |||
1392 | return false; | 1392 | return false; |
1393 | } | 1393 | } |
1394 | 1394 | ||
1395 | static int __devinit piix_init_sidpr(struct ata_host *host) | 1395 | static int piix_init_sidpr(struct ata_host *host) |
1396 | { | 1396 | { |
1397 | struct pci_dev *pdev = to_pci_dev(host->dev); | 1397 | struct pci_dev *pdev = to_pci_dev(host->dev); |
1398 | struct piix_host_priv *hpriv = host->private_data; | 1398 | struct piix_host_priv *hpriv = host->private_data; |
@@ -1595,8 +1595,7 @@ static void piix_ignore_devices_quirk(struct ata_host *host) | |||
1595 | * Zero on success, or -ERRNO value. | 1595 | * Zero on success, or -ERRNO value. |
1596 | */ | 1596 | */ |
1597 | 1597 | ||
1598 | static int __devinit piix_init_one(struct pci_dev *pdev, | 1598 | static int piix_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) |
1599 | const struct pci_device_id *ent) | ||
1600 | { | 1599 | { |
1601 | struct device *dev = &pdev->dev; | 1600 | struct device *dev = &pdev->dev; |
1602 | struct ata_port_info port_info[2]; | 1601 | struct ata_port_info port_info[2]; |