1 files changed, 17 insertions, 12 deletions

diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index d33a3f9c12b7..7429a55c164e 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -626,7 +626,8 @@ static int check_in_drive_list(ide_drive_t *drive, const char **list)
 static u8 hpt3xx_udma_filter(ide_drive_t *drive)
 {
         ide_hwif_t *hwif        = HWIF(drive);
-        struct hpt_info *info   = pci_get_drvdata(hwif->pci_dev);
+        struct pci_dev *dev     = to_pci_dev(hwif->dev);
+        struct hpt_info *info   = pci_get_drvdata(dev);
         u8 mask                 = hwif->ultra_mask;
 
         switch (info->chip_type) {
@@ -665,7 +666,8 @@ static u8 hpt3xx_udma_filter(ide_drive_t *drive)
 static u8 hpt3xx_mdma_filter(ide_drive_t *drive)
 {
         ide_hwif_t *hwif        = HWIF(drive);
-        struct hpt_info *info   = pci_get_drvdata(hwif->pci_dev);
+        struct pci_dev *dev     = to_pci_dev(hwif->dev);
+        struct hpt_info *info   = pci_get_drvdata(dev);
 
         switch (info->chip_type) {
         case HPT372 :
@@ -699,7 +701,7 @@ static u32 get_speed_setting(u8 speed, struct hpt_info *info)
 
 static void hpt3xx_set_mode(ide_drive_t *drive, const u8 speed)
 {
-        struct pci_dev  *dev    = HWIF(drive)->pci_dev;
+        struct pci_dev  *dev    = to_pci_dev(drive->hwif->dev);
         struct hpt_info *info   = pci_get_drvdata(dev);
         struct hpt_timings *t   = info->timings;
         u8  itr_addr            = 0x40 + (drive->dn * 4);
@@ -742,7 +744,7 @@ static void hpt3xx_quirkproc(ide_drive_t *drive)
 static void hpt3xx_maskproc(ide_drive_t *drive, int mask)
 {
         ide_hwif_t *hwif        = HWIF(drive);
-        struct pci_dev  *dev    = hwif->pci_dev;
+        struct pci_dev  *dev    = to_pci_dev(hwif->dev);
         struct hpt_info *info   = pci_get_drvdata(dev);
 
         if (drive->quirk_list) {
@@ -774,7 +776,7 @@ static void hpt3xx_maskproc(ide_drive_t *drive, int mask)
  */
 static void hpt366_dma_lost_irq(ide_drive_t *drive)
 {
-        struct pci_dev *dev = HWIF(drive)->pci_dev;
+        struct pci_dev *dev = to_pci_dev(drive->hwif->dev);
         u8 mcr1 = 0, mcr3 = 0, scr1 = 0;
 
         pci_read_config_byte(dev, 0x50, &mcr1);
@@ -790,18 +792,20 @@ static void hpt366_dma_lost_irq(ide_drive_t *drive)
 static void hpt370_clear_engine(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = HWIF(drive);
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
 
-        pci_write_config_byte(hwif->pci_dev, hwif->select_data, 0x37);
+        pci_write_config_byte(dev, hwif->select_data, 0x37);
         udelay(10);
 }
 
 static void hpt370_irq_timeout(ide_drive_t *drive)
 {
         ide_hwif_t *hwif        = HWIF(drive);
+        struct pci_dev *dev     = to_pci_dev(hwif->dev);
         u16 bfifo               = 0;
         u8  dma_cmd;
 
-        pci_read_config_word(hwif->pci_dev, hwif->select_data + 2, &bfifo);
+        pci_read_config_word(dev, hwif->select_data + 2, &bfifo);
         printk(KERN_DEBUG "%s: %d bytes in FIFO\n", drive->name, bfifo & 0x1ff);
 
         /* get DMA command mode */
@@ -844,10 +848,11 @@ static void hpt370_dma_timeout(ide_drive_t *drive)
 static int hpt374_ide_dma_test_irq(ide_drive_t *drive)
 {
         ide_hwif_t *hwif        = HWIF(drive);
+        struct pci_dev *dev     = to_pci_dev(hwif->dev);
         u16 bfifo               = 0;
         u8  dma_stat;
 
-        pci_read_config_word(hwif->pci_dev, hwif->select_data + 2, &bfifo);
+        pci_read_config_word(dev, hwif->select_data + 2, &bfifo);
         if (bfifo & 0x1FF) {
 //              printk("%s: %d bytes in FIFO\n", drive->name, bfifo);
                 return 0;
@@ -867,7 +872,7 @@ static int hpt374_ide_dma_test_irq(ide_drive_t *drive)
 static int hpt374_ide_dma_end(ide_drive_t *drive)
 {
         ide_hwif_t *hwif        = HWIF(drive);
-        struct pci_dev  *dev    = hwif->pci_dev;
+        struct pci_dev *dev     = to_pci_dev(hwif->dev);
         u8 mcr  = 0, mcr_addr   = hwif->select_data;
         u8 bwsr = 0, mask       = hwif->channel ? 0x02 : 0x01;
 
@@ -942,7 +947,7 @@ static void hpt3xxn_rw_disk(ide_drive_t *drive, struct request *rq)
 static int hpt3xx_busproc(ide_drive_t *drive, int state)
 {
         ide_hwif_t *hwif        = HWIF(drive);
-        struct pci_dev *dev     = hwif->pci_dev;
+        struct pci_dev *dev     = to_pci_dev(hwif->dev);
         u8  mcr_addr            = hwif->select_data + 2;
         u8  resetmask           = hwif->channel ? 0x80 : 0x40;
         u8  bsr2                = 0;
@@ -1278,7 +1283,7 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha
 
 static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)
 {
-        struct pci_dev  *dev    = hwif->pci_dev;
+        struct pci_dev *dev     = to_pci_dev(hwif->dev);
         struct hpt_info *info   = pci_get_drvdata(dev);
         int serialize           = HPT_SERIALIZE_IO;
         u8  scr1 = 0, ata66     = hwif->channel ? 0x01 : 0x02;
@@ -1393,7 +1398,7 @@ static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)
 
 static void __devinit init_dma_hpt366(ide_hwif_t *hwif, unsigned long dmabase)
 {
-        struct pci_dev  *dev            = hwif->pci_dev;
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
         u8 masterdma    = 0, slavedma   = 0;
         u8 dma_new      = 0, dma_old    = 0;
         unsigned long flags;