1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
index ac24f66897f6..9b17375d8056 100644
--- a/drivers/ata/sata_sis.c
+++ b/drivers/ata/sata_sis.c
@@ -128,7 +128,7 @@ static const struct ata_port_operations sis_ops = {
 
 static struct ata_port_info sis_port_info = {
         .sht            = &sis_sht,
-        .host_flags     = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,
+        .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,
         .pio_mask       = 0x1f,
         .mwdma_mask     = 0x7,
         .udma_mask      = 0x7f,
@@ -158,7 +158,7 @@ static unsigned int get_scr_cfg_addr(unsigned int port_no, unsigned int sc_reg,
 
 static u32 sis_scr_cfg_read (struct ata_port *ap, unsigned int sc_reg)
 {
-        struct pci_dev *pdev = to_pci_dev(ap->host_set->dev);
+        struct pci_dev *pdev = to_pci_dev(ap->host->dev);
         unsigned int cfg_addr = get_scr_cfg_addr(ap->port_no, sc_reg, pdev->device);
         u32 val, val2 = 0;
         u8 pmr;
@@ -178,7 +178,7 @@ static u32 sis_scr_cfg_read (struct ata_port *ap, unsigned int sc_reg)
 
 static void sis_scr_cfg_write (struct ata_port *ap, unsigned int scr, u32 val)
 {
-        struct pci_dev *pdev = to_pci_dev(ap->host_set->dev);
+        struct pci_dev *pdev = to_pci_dev(ap->host->dev);
         unsigned int cfg_addr = get_scr_cfg_addr(ap->port_no, scr, pdev->device);
         u8 pmr;
 
@@ -195,7 +195,7 @@ static void sis_scr_cfg_write (struct ata_port *ap, unsigned int scr, u32 val)
 
 static u32 sis_scr_read (struct ata_port *ap, unsigned int sc_reg)
 {
-        struct pci_dev *pdev = to_pci_dev(ap->host_set->dev);
+        struct pci_dev *pdev = to_pci_dev(ap->host->dev);
         u32 val, val2 = 0;
         u8 pmr;
 
@@ -217,7 +217,7 @@ static u32 sis_scr_read (struct ata_port *ap, unsigned int sc_reg)
 
 static void sis_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val)
 {
-        struct pci_dev *pdev = to_pci_dev(ap->host_set->dev);
+        struct pci_dev *pdev = to_pci_dev(ap->host->dev);
         u8 pmr;
 
         if (sc_reg > SCR_CONTROL)
@@ -275,17 +275,17 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         /* check and see if the SCRs are in IO space or PCI cfg space */
         pci_read_config_dword(pdev, SIS_GENCTL, &genctl);
         if ((genctl & GENCTL_IOMAPPED_SCR) == 0)
-                probe_ent->host_flags |= SIS_FLAG_CFGSCR;
+                probe_ent->port_flags |= SIS_FLAG_CFGSCR;
 
         /* if hardware thinks SCRs are in IO space, but there are
          * no IO resources assigned, change to PCI cfg space.
          */
-        if ((!(probe_ent->host_flags & SIS_FLAG_CFGSCR)) &&
+        if ((!(probe_ent->port_flags & SIS_FLAG_CFGSCR)) &&
             ((pci_resource_start(pdev, SIS_SCR_PCI_BAR) == 0) ||
              (pci_resource_len(pdev, SIS_SCR_PCI_BAR) < 128))) {
                 genctl &= ~GENCTL_IOMAPPED_SCR;
                 pci_write_config_dword(pdev, SIS_GENCTL, genctl);
-                probe_ent->host_flags |= SIS_FLAG_CFGSCR;
+                probe_ent->port_flags |= SIS_FLAG_CFGSCR;
         }
 
         pci_read_config_byte(pdev, SIS_PMR, &pmr);
@@ -306,7 +306,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                 port2_start = 0x20;
         }
 
-        if (!(probe_ent->host_flags & SIS_FLAG_CFGSCR)) {
+        if (!(probe_ent->port_flags & SIS_FLAG_CFGSCR)) {
                 probe_ent->port[0].scr_addr =
                         pci_resource_start(pdev, SIS_SCR_PCI_BAR);
                 probe_ent->port[1].scr_addr =