hwmon/w83793: Remove the description of AMDSI and update the voltage formula

[powerpc.git] / drivers / ata / sata_via.c

diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index 7f087ae..1c7f19a 100644 (file)
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -77,9 +77,9 @@ static void svia_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
 static void vt6420_error_handler(struct ata_port *ap);
 
 static const struct pci_device_id svia_pci_tbl[] = {
-       { 0x1106, 0x0591, PCI_ANY_ID, PCI_ANY_ID, 0, 0, vt6420 },
-       { 0x1106, 0x3149, PCI_ANY_ID, PCI_ANY_ID, 0, 0, vt6420 },
-       { 0x1106, 0x3249, PCI_ANY_ID, PCI_ANY_ID, 0, 0, vt6421 },
+       { PCI_VDEVICE(VIA, 0x0591), vt6420 },
+       { PCI_VDEVICE(VIA, 0x3149), vt6420 },
+       { PCI_VDEVICE(VIA, 0x3249), vt6421 },
 
        { }     /* terminate list */
 };
@@ -230,7 +230,7 @@ static int vt6420_prereset(struct ata_port *ap)
        int online;
 
        /* don't do any SCR stuff if we're not loading */
-       if (!ATA_PFLAG_LOADING)
+       if (!(ap->pflags & ATA_PFLAG_LOADING))
                goto skip_scr;
 
        /* Resume phy.  This is the old resume sequence from
@@ -318,9 +318,10 @@ static void vt6421_init_addrs(struct ata_probe_ent *probe_ent,
 static struct ata_probe_ent *vt6420_init_probe_ent(struct pci_dev *pdev)
 {
        struct ata_probe_ent *probe_ent;
-       struct ata_port_info *ppi = &vt6420_port_info;
-
-       probe_ent = ata_pci_init_native_mode(pdev, &ppi, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY);
+       struct ata_port_info *ppi[2];
+       
+       ppi[0] = ppi[1] = &vt6420_port_info;
+       probe_ent = ata_pci_init_native_mode(pdev, ppi, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY);
        if (!probe_ent)
                return NULL;