aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/sata_sil.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ata/sata_sil.c')
-rw-r--r--drivers/ata/sata_sil.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index 917b7ea4ef7..170d36e6260 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -114,7 +114,7 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
114#ifdef CONFIG_PM 114#ifdef CONFIG_PM
115static int sil_pci_device_resume(struct pci_dev *pdev); 115static int sil_pci_device_resume(struct pci_dev *pdev);
116#endif 116#endif
117static void sil_dev_config(struct ata_port *ap, struct ata_device *dev); 117static void sil_dev_config(struct ata_device *dev);
118static u32 sil_scr_read (struct ata_port *ap, unsigned int sc_reg); 118static u32 sil_scr_read (struct ata_port *ap, unsigned int sc_reg);
119static void sil_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val); 119static void sil_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
120static void sil_post_set_mode (struct ata_port *ap); 120static void sil_post_set_mode (struct ata_port *ap);
@@ -521,7 +521,6 @@ static void sil_thaw(struct ata_port *ap)
521 521
522/** 522/**
523 * sil_dev_config - Apply device/host-specific errata fixups 523 * sil_dev_config - Apply device/host-specific errata fixups
524 * @ap: Port containing device to be examined
525 * @dev: Device to be examined 524 * @dev: Device to be examined
526 * 525 *
527 * After the IDENTIFY [PACKET] DEVICE step is complete, and a 526 * After the IDENTIFY [PACKET] DEVICE step is complete, and a
@@ -548,8 +547,9 @@ static void sil_thaw(struct ata_port *ap)
548 * appreciated. 547 * appreciated.
549 * - But then again UDMA5 is hardly anything to complain about 548 * - But then again UDMA5 is hardly anything to complain about
550 */ 549 */
551static void sil_dev_config(struct ata_port *ap, struct ata_device *dev) 550static void sil_dev_config(struct ata_device *dev)
552{ 551{
552 struct ata_port *ap = dev->ap;
553 int print_info = ap->eh_context.i.flags & ATA_EHI_PRINTINFO; 553 int print_info = ap->eh_context.i.flags & ATA_EHI_PRINTINFO;
554 unsigned int n, quirks = 0; 554 unsigned int n, quirks = 0;
555 unsigned char model_num[ATA_ID_PROD_LEN + 1]; 555 unsigned char model_num[ATA_ID_PROD_LEN + 1];