37 files changed, 233 insertions, 180 deletions

diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index 1ca1210ec1c0..782e5da01578 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -184,6 +184,7 @@ static int ide_dma_good_drive(ide_drive_t *drive)
 int ide_build_sglist(ide_drive_t *drive, struct request *rq)
 {
         ide_hwif_t *hwif = HWIF(drive);
+        struct pci_dev *pdev = to_pci_dev(hwif->dev);
         struct scatterlist *sg = hwif->sg_table;
 
         ide_map_sg(drive, rq);
@@ -193,7 +194,7 @@ int ide_build_sglist(ide_drive_t *drive, struct request *rq)
         else
                 hwif->sg_dma_direction = PCI_DMA_TODEVICE;
 
-        return pci_map_sg(hwif->pci_dev, sg, hwif->sg_nents, hwif->sg_dma_direction);
+        return pci_map_sg(pdev, sg, hwif->sg_nents, hwif->sg_dma_direction);
 }
 
 EXPORT_SYMBOL_GPL(ide_build_sglist);
@@ -306,11 +307,11 @@ EXPORT_SYMBOL_GPL(ide_build_dmatable);
  
 void ide_destroy_dmatable (ide_drive_t *drive)
 {
-        struct pci_dev *dev = HWIF(drive)->pci_dev;
-        struct scatterlist *sg = HWIF(drive)->sg_table;
-        int nents = HWIF(drive)->sg_nents;
+        ide_hwif_t *hwif = drive->hwif;
+        struct pci_dev *pdev = to_pci_dev(hwif->dev);
 
-        pci_unmap_sg(dev, sg, nents, HWIF(drive)->sg_dma_direction);
+        pci_unmap_sg(pdev, hwif->sg_table, hwif->sg_nents,
+                     hwif->sg_dma_direction);
 }
 
 EXPORT_SYMBOL_GPL(ide_destroy_dmatable);
@@ -843,10 +844,10 @@ EXPORT_SYMBOL(ide_dma_timeout);
 static void ide_release_dma_engine(ide_hwif_t *hwif)
 {
         if (hwif->dmatable_cpu) {
-                pci_free_consistent(hwif->pci_dev,
-                                    PRD_ENTRIES * PRD_BYTES,
-                                    hwif->dmatable_cpu,
-                                    hwif->dmatable_dma);
+                struct pci_dev *pdev = to_pci_dev(hwif->dev);
+
+                pci_free_consistent(pdev, PRD_ENTRIES * PRD_BYTES,
+                                    hwif->dmatable_cpu, hwif->dmatable_dma);
                 hwif->dmatable_cpu = NULL;
         }
 }
@@ -874,7 +875,9 @@ int ide_release_dma(ide_hwif_t *hwif)
 
 static int ide_allocate_dma_engine(ide_hwif_t *hwif)
 {
-        hwif->dmatable_cpu = pci_alloc_consistent(hwif->pci_dev,
+        struct pci_dev *pdev = to_pci_dev(hwif->dev);
+
+        hwif->dmatable_cpu = pci_alloc_consistent(pdev,
                                                   PRD_ENTRIES * PRD_BYTES,
                                                   &hwif->dmatable_dma);
 
diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index 9b44fbdfe41f..b42940d8bf70 100644
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -358,8 +358,10 @@ void ide_toggle_bounce(ide_drive_t *drive, int on)
         if (!PCI_DMA_BUS_IS_PHYS) {
                 addr = BLK_BOUNCE_ANY;
         } else if (on && drive->media == ide_disk) {
-                if (HWIF(drive)->pci_dev)
-                        addr = HWIF(drive)->pci_dev->dma_mask;
+                struct device *dev = drive->hwif->dev;
+
+                if (dev && dev->dma_mask)
+                        addr = *dev->dma_mask;
         }
 
         if (drive->queue)
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index cdb81471102a..5141730dc960 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -622,8 +622,8 @@ static void hwif_register (ide_hwif_t *hwif)
         strlcpy(hwif->gendev.bus_id,hwif->name,BUS_ID_SIZE);
         hwif->gendev.driver_data = hwif;
         if (hwif->gendev.parent == NULL) {
-                if (hwif->pci_dev)
-                        hwif->gendev.parent = &hwif->pci_dev->dev;
+                if (hwif->dev)
+                        hwif->gendev.parent = hwif->dev;
                 else
                         /* Would like to do = &device_legacy */
                         hwif->gendev.parent = NULL;
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 97894abd9ebc..9805c43dfd8a 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -405,8 +405,9 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif)
         hwif->chipset                   = tmp_hwif->chipset;
         hwif->hold                      = tmp_hwif->hold;
 
+        hwif->dev                       = tmp_hwif->dev;
+
 #ifdef CONFIG_BLK_DEV_IDEPCI
-        hwif->pci_dev                   = tmp_hwif->pci_dev;
         hwif->cds                       = tmp_hwif->cds;
 #endif
 
diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index 15597597740f..28401701b8d0 100644
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -90,7 +90,7 @@ static u8 pci_bus_clock_list_ultra (u8 speed, struct chipset_bus_clock_list_entr
 static void aec6210_set_mode(ide_drive_t *drive, const u8 speed)
 {
         ide_hwif_t *hwif        = HWIF(drive);
-        struct pci_dev *dev     = hwif->pci_dev;
+        struct pci_dev *dev     = to_pci_dev(hwif->dev);
         u16 d_conf              = 0;
         u8 ultra = 0, ultra_conf = 0;
         u8 tmp0 = 0, tmp1 = 0, tmp2 = 0;
@@ -116,7 +116,7 @@ static void aec6210_set_mode(ide_drive_t *drive, const u8 speed)
 static void aec6260_set_mode(ide_drive_t *drive, const u8 speed)
 {
         ide_hwif_t *hwif        = HWIF(drive);
-        struct pci_dev *dev     = hwif->pci_dev;
+        struct pci_dev *dev     = to_pci_dev(hwif->dev);
         u8 unit         = (drive->select.b.unit & 0x01);
         u8 tmp1 = 0, tmp2 = 0;
         u8 ultra = 0, drive_conf = 0, ultra_conf = 0;
@@ -170,7 +170,7 @@ static unsigned int __devinit init_chipset_aec62xx(struct pci_dev *dev, const ch
 
 static void __devinit init_hwif_aec62xx(ide_hwif_t *hwif)
 {
-        struct pci_dev *dev     = hwif->pci_dev;
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
 
         hwif->set_pio_mode = &aec_set_pio_mode;
 
@@ -188,7 +188,7 @@ static void __devinit init_hwif_aec62xx(ide_hwif_t *hwif)
         if (hwif->cbl != ATA_CBL_PATA40_SHORT) {
                 u8 ata66 = 0, mask = hwif->channel ? 0x02 : 0x01;
 
-                pci_read_config_byte(hwif->pci_dev, 0x49, &ata66);
+                pci_read_config_byte(dev, 0x49, &ata66);
 
                 hwif->cbl = (ata66 & mask) ? ATA_CBL_PATA40 : ATA_CBL_PATA80;
         }
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index 0b65a2c9308f..88148404d918 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -293,7 +293,7 @@ static int ali_get_info (char *buffer, char **addr, off_t offset, int count)
 static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
         ide_hwif_t *hwif = HWIF(drive);
-        struct pci_dev *dev = hwif->pci_dev;
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
         int s_time, a_time, c_time;
         u8 s_clc, a_clc, r_clc;
         unsigned long flags;
@@ -396,7 +396,7 @@ static u8 ali_udma_filter(ide_drive_t *drive)
 static void ali_set_dma_mode(ide_drive_t *drive, const u8 speed)
 {
         ide_hwif_t *hwif        = HWIF(drive);
-        struct pci_dev *dev     = hwif->pci_dev;
+        struct pci_dev *dev     = to_pci_dev(hwif->dev);
         u8 speed1               = speed;
         u8 unit                 = (drive->select.b.unit & 0x01);
         u8 tmpbyte              = 0x00;
@@ -625,7 +625,7 @@ static int ali_cable_override(struct pci_dev *pdev)
 
 static u8 __devinit ata66_ali15x3(ide_hwif_t *hwif)
 {
-        struct pci_dev *dev     = hwif->pci_dev;
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
         unsigned long flags;
         u8 cbl = ATA_CBL_PATA40, tmpbyte;
 
@@ -688,12 +688,13 @@ static void __devinit init_hwif_common_ali15x3 (ide_hwif_t *hwif)
 
 static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif)
 {
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
         u8 ideic, inmir;
         s8 irq_routing_table[] = { -1,  9, 3, 10, 4,  5, 7,  6,
                                       1, 11, 0, 12, 0, 14, 0, 15 };
         int irq = -1;
 
-        if (hwif->pci_dev->device == PCI_DEVICE_ID_AL_M5229)
+        if (dev->device == PCI_DEVICE_ID_AL_M5229)
                 hwif->irq = hwif->channel ? 15 : 14;
 
         if (isa_dev) {
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index 2e8cbcaf3ef5..ebc16deffe16 100644
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -86,6 +86,7 @@ static void amd_set_speed(struct pci_dev *dev, u8 dn, u8 udma_mask,
 static void amd_set_drive(ide_drive_t *drive, const u8 speed)
 {
         ide_hwif_t *hwif = drive->hwif;
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
         ide_drive_t *peer = hwif->drives + (~drive->dn & 1);
         struct ide_timing t, p;
         int T, UT;
@@ -104,7 +105,7 @@ static void amd_set_drive(ide_drive_t *drive, const u8 speed)
         if (speed == XFER_UDMA_5 && amd_clock <= 33333) t.udma = 1;
         if (speed == XFER_UDMA_6 && amd_clock <= 33333) t.udma = 15;
 
-        amd_set_speed(hwif->pci_dev, drive->dn, udma_mask, &t);
+        amd_set_speed(dev, drive->dn, udma_mask, &t);
 }
 
 /*
@@ -202,8 +203,10 @@ static unsigned int __devinit init_chipset_amd74xx(struct pci_dev *dev,
 
 static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif)
 {
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
+
         if (hwif->irq == 0) /* 0 is bogus but will do for now */
-                hwif->irq = pci_get_legacy_ide_irq(hwif->pci_dev, hwif->channel);
+                hwif->irq = pci_get_legacy_ide_irq(dev, hwif->channel);
 
         hwif->set_pio_mode = &amd_set_pio_mode;
         hwif->set_dma_mode = &amd_set_drive;
diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c
index 491871984aaa..ab856d3583e1 100644
--- a/drivers/ide/pci/atiixp.c
+++ b/drivers/ide/pci/atiixp.c
@@ -55,7 +55,7 @@ static DEFINE_SPINLOCK(atiixp_lock);
 
 static void atiixp_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        struct pci_dev *dev = drive->hwif->pci_dev;
+        struct pci_dev *dev = to_pci_dev(drive->hwif->dev);
         unsigned long flags;
         int timing_shift = (drive->dn & 2) ? 16 : 0 + (drive->dn & 1) ? 0 : 8;
         u32 pio_timing_data;
@@ -88,7 +88,7 @@ static void atiixp_set_pio_mode(ide_drive_t *drive, const u8 pio)
 
 static void atiixp_set_dma_mode(ide_drive_t *drive, const u8 speed)
 {
-        struct pci_dev *dev = drive->hwif->pci_dev;
+        struct pci_dev *dev = to_pci_dev(drive->hwif->dev);
         unsigned long flags;
         int timing_shift = (drive->dn & 2) ? 16 : 0 + (drive->dn & 1) ? 0 : 8;
         u32 tmp32;
@@ -133,9 +133,8 @@ static void atiixp_set_dma_mode(ide_drive_t *drive, const u8 speed)
 
 static void __devinit init_hwif_atiixp(ide_hwif_t *hwif)
 {
-        u8 udma_mode = 0;
-        u8 ch = hwif->channel;
-        struct pci_dev *pdev = hwif->pci_dev;
+        struct pci_dev *pdev = to_pci_dev(hwif->dev);
+        u8 udma_mode = 0, ch = hwif->channel;
 
         hwif->set_pio_mode = &atiixp_set_pio_mode;
         hwif->set_dma_mode = &atiixp_set_dma_mode;
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c
index effd79a715b0..70265d5c59ba 100644
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/pci/cmd64x.c
@@ -71,7 +71,7 @@ static u8 quantize_timing(int timing, int quant)
  */
 static void program_cycle_times (ide_drive_t *drive, int cycle_time, int active_time)
 {
-        struct pci_dev *dev     = HWIF(drive)->pci_dev;
+        struct pci_dev *dev     = to_pci_dev(drive->hwif->dev);
         int clock_time          = 1000 / system_bus_clock();
         u8  cycle_count, active_count, recovery_count, drwtim;
         static const u8 recovery_values[] =
@@ -118,7 +118,7 @@ static void program_cycle_times (ide_drive_t *drive, int cycle_time, int active_
 static void cmd64x_tune_pio(ide_drive_t *drive, const u8 pio)
 {
         ide_hwif_t *hwif        = HWIF(drive);
-        struct pci_dev *dev     = hwif->pci_dev;
+        struct pci_dev *dev     = to_pci_dev(hwif->dev);
         unsigned int cycle_time;
         u8 setup_count, arttim = 0;
 
@@ -183,7 +183,7 @@ static void cmd64x_set_pio_mode(ide_drive_t *drive, const u8 pio)
 static void cmd64x_set_dma_mode(ide_drive_t *drive, const u8 speed)
 {
         ide_hwif_t *hwif        = HWIF(drive);
-        struct pci_dev *dev     = hwif->pci_dev;
+        struct pci_dev *dev     = to_pci_dev(hwif->dev);
         u8 unit                 = drive->dn & 0x01;
         u8 regU = 0, pciU       = hwif->channel ? UDIDETCR1 : UDIDETCR0;
 
@@ -245,7 +245,7 @@ static int cmd648_ide_dma_end (ide_drive_t *drive)
 static int cmd64x_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);
         int irq_reg             = hwif->channel ? ARTTIM23 : CFR;
         u8  irq_mask            = hwif->channel ? ARTTIM23_INTR_CH1 :
                                                   CFR_INTR_CH0;
@@ -285,7 +285,7 @@ static int cmd648_ide_dma_test_irq (ide_drive_t *drive)
 static int cmd64x_ide_dma_test_irq (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);
         int irq_reg             = hwif->channel ? ARTTIM23 : CFR;
         u8  irq_mask            = hwif->channel ? ARTTIM23_INTR_CH1 :
                                                   CFR_INTR_CH0;
@@ -375,7 +375,7 @@ static unsigned int __devinit init_chipset_cmd64x(struct pci_dev *dev, const cha
 
 static u8 __devinit ata66_cmd64x(ide_hwif_t *hwif)
 {
-        struct pci_dev  *dev    = hwif->pci_dev;
+        struct pci_dev  *dev    = to_pci_dev(hwif->dev);
         u8 bmidecsr = 0, mask   = hwif->channel ? 0x02 : 0x01;
 
         switch (dev->device) {
@@ -390,7 +390,7 @@ static u8 __devinit ata66_cmd64x(ide_hwif_t *hwif)
 
 static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif)
 {
-        struct pci_dev *dev     = hwif->pci_dev;
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
 
         hwif->set_pio_mode = &cmd64x_set_pio_mode;
         hwif->set_dma_mode = &cmd64x_set_dma_mode;
diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c
index 6ec00b8d7ec1..9e01c6dc758e 100644
--- a/drivers/ide/pci/cs5520.c
+++ b/drivers/ide/pci/cs5520.c
@@ -69,7 +69,7 @@ static struct pio_clocks cs5520_pio_clocks[]={
 static void cs5520_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
         ide_hwif_t *hwif = HWIF(drive);
-        struct pci_dev *pdev = hwif->pci_dev;
+        struct pci_dev *pdev = to_pci_dev(hwif->dev);
         int controller = drive->dn > 1 ? 1 : 0;
 
         /* FIXME: if DMA = 1 do we need to set the DMA bit here ? */
diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c
index 50b3d7791f55..e44011481fa6 100644
--- a/drivers/ide/pci/cs5535.c
+++ b/drivers/ide/pci/cs5535.c
@@ -177,13 +177,15 @@ static u8 __devinit cs5535_cable_detect(struct pci_dev *dev)
  */
 static void __devinit init_hwif_cs5535(ide_hwif_t *hwif)
 {
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
+
         hwif->set_pio_mode = &cs5535_set_pio_mode;
         hwif->set_dma_mode = &cs5535_set_dma_mode;
 
         if (hwif->dma_base == 0)
                 return;
 
-        hwif->cbl = cs5535_cable_detect(hwif->pci_dev);
+        hwif->cbl = cs5535_cable_detect(dev);
 }
 
 static const struct ide_port_info cs5535_chipset __devinitdata = {
diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c
index 3ec4c659a37d..d43c52da4906 100644
--- a/drivers/ide/pci/cy82c693.c
+++ b/drivers/ide/pci/cy82c693.c
@@ -228,7 +228,7 @@ static void cy82c693_set_dma_mode(ide_drive_t *drive, const u8 mode)
 static void cy82c693_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
         ide_hwif_t *hwif = HWIF(drive);
-        struct pci_dev *dev = hwif->pci_dev;
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
         pio_clocks_t pclk;
         unsigned int addrCtrl;
 
@@ -397,8 +397,9 @@ static void __devinit init_hwif_cy82c693(ide_hwif_t *hwif)
 static void __devinit init_iops_cy82c693(ide_hwif_t *hwif)
 {
         static ide_hwif_t *primary;
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
 
-        if (PCI_FUNC(hwif->pci_dev->devfn) == 1)
+        if (PCI_FUNC(dev->devfn) == 1)
                 primary = hwif;
         else {
                 hwif->mate = primary;
diff --git a/drivers/ide/pci/delkin_cb.c b/drivers/ide/pci/delkin_cb.c
index 26aa492071bb..81d0bf6fcc60 100644
--- a/drivers/ide/pci/delkin_cb.c
+++ b/drivers/ide/pci/delkin_cb.c
@@ -87,7 +87,7 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
                 return -ENODEV;
         }
         pci_set_drvdata(dev, hwif);
-        hwif->pci_dev = dev;
+        hwif->dev = &dev->dev;
         drive = &hwif->drives[0];
         if (drive->present) {
                 drive->io_32bit = 1;
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c
index 48a9ff2e8c33..7f6abc68c0bb 100644
--- a/drivers/ide/pci/hpt34x.c
+++ b/drivers/ide/pci/hpt34x.c
@@ -45,7 +45,7 @@
 
 static void hpt34x_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);
         u32 reg1= 0, tmp1 = 0, reg2 = 0, tmp2 = 0;
         u8                      hi_speed, lo_speed;
 
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;
diff --git a/drivers/ide/pci/it8213.c b/drivers/ide/pci/it8213.c
index 2a0f45c4f4c4..df74e588a530 100644
--- a/drivers/ide/pci/it8213.c
+++ b/drivers/ide/pci/it8213.c
@@ -28,7 +28,7 @@
 static void it8213_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
         ide_hwif_t *hwif        = HWIF(drive);
-        struct pci_dev *dev     = hwif->pci_dev;
+        struct pci_dev *dev     = to_pci_dev(hwif->dev);
         int is_slave            = drive->dn & 1;
         int master_port         = 0x40;
         int slave_port          = 0x44;
@@ -85,7 +85,7 @@ static void it8213_set_pio_mode(ide_drive_t *drive, const u8 pio)
 static void it8213_set_dma_mode(ide_drive_t *drive, const u8 speed)
 {
         ide_hwif_t *hwif        = HWIF(drive);
-        struct pci_dev *dev     = hwif->pci_dev;
+        struct pci_dev *dev     = to_pci_dev(hwif->dev);
         u8 maslave              = 0x40;
         int a_speed             = 3 << (drive->dn * 4);
         int u_flag              = 1 << drive->dn;
@@ -152,6 +152,7 @@ static void it8213_set_dma_mode(ide_drive_t *drive, const u8 speed)
 
 static void __devinit init_hwif_it8213(ide_hwif_t *hwif)
 {
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
         u8 reg42h = 0;
 
         hwif->set_dma_mode = &it8213_set_dma_mode;
@@ -160,7 +161,7 @@ static void __devinit init_hwif_it8213(ide_hwif_t *hwif)
         if (!hwif->dma_base)
                 return;
 
-        pci_read_config_byte(hwif->pci_dev, 0x42, &reg42h);
+        pci_read_config_byte(dev, 0x42, &reg42h);
 
         if (hwif->cbl != ATA_CBL_PATA40_SHORT)
                 hwif->cbl = (reg42h & 0x02) ? ATA_CBL_PATA40 : ATA_CBL_PATA80;
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index e610a5340fdc..c0797b82ce78 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -113,7 +113,8 @@ static int it8212_noraid;
 
 static void it821x_program(ide_drive_t *drive, u16 timing)
 {
-        ide_hwif_t *hwif        = drive->hwif;
+        ide_hwif_t *hwif = drive->hwif;
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
         struct it821x_dev *itdev = ide_get_hwifdata(hwif);
         int channel = hwif->channel;
         u8 conf;
@@ -123,7 +124,8 @@ static void it821x_program(ide_drive_t *drive, u16 timing)
                 conf = timing >> 8;
         else
                 conf = timing & 0xFF;
-        pci_write_config_byte(hwif->pci_dev, 0x54 + 4 * channel, conf);
+
+        pci_write_config_byte(dev, 0x54 + 4 * channel, conf);
 }
 
 /**
@@ -137,7 +139,8 @@ static void it821x_program(ide_drive_t *drive, u16 timing)
 
 static void it821x_program_udma(ide_drive_t *drive, u16 timing)
 {
-        ide_hwif_t *hwif        = drive->hwif;
+        ide_hwif_t *hwif = drive->hwif;
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
         struct it821x_dev *itdev = ide_get_hwifdata(hwif);
         int channel = hwif->channel;
         int unit = drive->select.b.unit;
@@ -148,11 +151,12 @@ static void it821x_program_udma(ide_drive_t *drive, u16 timing)
                 conf = timing >> 8;
         else
                 conf = timing & 0xFF;
-        if(itdev->timing10 == 0)
-                pci_write_config_byte(hwif->pci_dev, 0x56 + 4 * channel + unit, conf);
+
+        if (itdev->timing10 == 0)
+                pci_write_config_byte(dev, 0x56 + 4 * channel + unit, conf);
         else {
-                pci_write_config_byte(hwif->pci_dev, 0x56 + 4 * channel, conf);
-                pci_write_config_byte(hwif->pci_dev, 0x56 + 4 * channel + 1, conf);
+                pci_write_config_byte(dev, 0x56 + 4 * channel, conf);
+                pci_write_config_byte(dev, 0x56 + 4 * channel + 1, conf);
         }
 }
 
@@ -167,6 +171,7 @@ static void it821x_program_udma(ide_drive_t *drive, u16 timing)
 static void it821x_clock_strategy(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = drive->hwif;
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
         struct it821x_dev *itdev = ide_get_hwifdata(hwif);
 
         u8 unit = drive->select.b.unit;
@@ -205,10 +210,11 @@ static void it821x_clock_strategy(ide_drive_t *drive)
                 itdev->clock_mode = ATA_50;
                 sel = 1;
         }
-        pci_read_config_byte(hwif->pci_dev, 0x50, &v);
+
+        pci_read_config_byte(dev, 0x50, &v);
         v &= ~(1 << (1 + hwif->channel));
         v |= sel << (1 + hwif->channel);
-        pci_write_config_byte(hwif->pci_dev, 0x50, v);
+        pci_write_config_byte(dev, 0x50, v);
 
         /*
          *      Reprogram the UDMA/PIO of the pair drive for the switch
@@ -282,7 +288,8 @@ static void it821x_set_pio_mode(ide_drive_t *drive, const u8 pio)
 
 static void it821x_tune_mwdma (ide_drive_t *drive, byte mode_wanted)
 {
-        ide_hwif_t *hwif        = drive->hwif;
+        ide_hwif_t *hwif = drive->hwif;
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
         struct it821x_dev *itdev = (void *)ide_get_hwifdata(hwif);
         int unit = drive->select.b.unit;
         int channel = hwif->channel;
@@ -297,12 +304,12 @@ static void it821x_tune_mwdma (ide_drive_t *drive, byte mode_wanted)
         itdev->udma[unit] = UDMA_OFF;
 
         /* UDMA bits off - Revision 0x10 do them in pairs */
-        pci_read_config_byte(hwif->pci_dev, 0x50, &conf);
-        if(itdev->timing10)
+        pci_read_config_byte(dev, 0x50, &conf);
+        if (itdev->timing10)
                 conf |= channel ? 0x60: 0x18;
         else
                 conf |= 1 << (3 + 2 * channel + unit);
-        pci_write_config_byte(hwif->pci_dev, 0x50, conf);
+        pci_write_config_byte(dev, 0x50, conf);
 
         it821x_clock_strategy(drive);
         /* FIXME: do we need to program this ? */
@@ -320,7 +327,8 @@ static void it821x_tune_mwdma (ide_drive_t *drive, byte mode_wanted)
 
 static void it821x_tune_udma (ide_drive_t *drive, byte mode_wanted)
 {
-        ide_hwif_t *hwif        = drive->hwif;
+        ide_hwif_t *hwif = drive->hwif;
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
         struct it821x_dev *itdev = ide_get_hwifdata(hwif);
         int unit = drive->select.b.unit;
         int channel = hwif->channel;
@@ -337,12 +345,12 @@ static void it821x_tune_udma (ide_drive_t *drive, byte mode_wanted)
                 itdev->udma[unit] |= 0x8080;    /* UDMA 5/6 select on */
 
         /* UDMA on. Again revision 0x10 must do the pair */
-        pci_read_config_byte(hwif->pci_dev, 0x50, &conf);
-        if(itdev->timing10)
+        pci_read_config_byte(dev, 0x50, &conf);
+        if (itdev->timing10)
                 conf &= channel ? 0x9F: 0xE7;
         else
                 conf &= ~ (1 << (3 + 2 * channel + unit));
-        pci_write_config_byte(hwif->pci_dev, 0x50, conf);
+        pci_write_config_byte(dev, 0x50, conf);
 
         it821x_clock_strategy(drive);
         it821x_program_udma(drive, itdev->udma[unit]);
@@ -520,6 +528,7 @@ static void __devinit it821x_quirkproc(ide_drive_t *drive)
 
 static void __devinit init_hwif_it821x(ide_hwif_t *hwif)
 {
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
         struct it821x_dev *idev = kzalloc(sizeof(struct it821x_dev), GFP_KERNEL);
         u8 conf;
 
@@ -532,7 +541,7 @@ static void __devinit init_hwif_it821x(ide_hwif_t *hwif)
 
         ide_set_hwifdata(hwif, idev);
 
-        pci_read_config_byte(hwif->pci_dev, 0x50, &conf);
+        pci_read_config_byte(dev, 0x50, &conf);
         if (conf & 1) {
                 idev->smart = 1;
                 hwif->host_flags |= IDE_HFLAG_NO_ATAPI_DMA;
@@ -555,7 +564,7 @@ static void __devinit init_hwif_it821x(ide_hwif_t *hwif)
          *      this is necessary.
          */
 
-        pci_read_config_byte(hwif->pci_dev, 0x08, &conf);
+        pci_read_config_byte(dev, 0x08, &conf);
         if (conf == 0x10) {
                 idev->timing10 = 1;
                 hwif->host_flags |= IDE_HFLAG_NO_ATAPI_DMA;
diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c
index 0083eaf89c77..8b40f6479c55 100644
--- a/drivers/ide/pci/jmicron.c
+++ b/drivers/ide/pci/jmicron.c
@@ -30,7 +30,7 @@ typedef enum {
 
 static u8 __devinit ata66_jmicron(ide_hwif_t *hwif)
 {
-        struct pci_dev *pdev = hwif->pci_dev;
+        struct pci_dev *pdev = to_pci_dev(hwif->dev);
 
         u32 control;
         u32 control5;
diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c
index d4df4642dbb5..bd05a4aae61b 100644
--- a/drivers/ide/pci/ns87415.c
+++ b/drivers/ide/pci/ns87415.c
@@ -71,10 +71,9 @@ static u8 superio_ide_inb (unsigned long port)
 
 static void __devinit superio_ide_init_iops (struct hwif_s *hwif)
 {
+        struct pci_dev *pdev = to_pci_dev(hwif->dev);
         u32 base, dmabase;
-        u8 tmp;
-        struct pci_dev *pdev = hwif->pci_dev;
-        u8 port = hwif->channel;
+        u8 port = hwif->channel, tmp;
 
         base = pci_resource_start(pdev, port * 2) & ~3;
         dmabase = pci_resource_start(pdev, 4) & ~3;
@@ -93,10 +92,11 @@ static void __devinit superio_ide_init_iops (struct hwif_s *hwif)
 
 static void __devinit init_iops_ns87415(ide_hwif_t *hwif)
 {
-        if (PCI_SLOT(hwif->pci_dev->devfn) == 0xE) {
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
+
+        if (PCI_SLOT(dev->devfn) == 0xE)
                 /* Built-in - assume it's under superio. */
                 superio_ide_init_iops(hwif);
-        }
 }
 #endif
 
@@ -110,8 +110,8 @@ static unsigned int ns87415_count = 0, ns87415_control[MAX_HWIFS] = { 0 };
 static void ns87415_prepare_drive (ide_drive_t *drive, unsigned int use_dma)
 {
         ide_hwif_t *hwif = HWIF(drive);
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
         unsigned int bit, other, new, *old = (unsigned int *) hwif->select_data;
-        struct pci_dev *dev = hwif->pci_dev;
         unsigned long flags;
 
         local_irq_save(flags);
@@ -189,7 +189,7 @@ static int ns87415_ide_dma_setup(ide_drive_t *drive)
 
 static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif)
 {
-        struct pci_dev *dev = hwif->pci_dev;
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
         unsigned int ctrl, using_inta;
         u8 progif;
 #ifdef __sparc_v9__
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index 89d2363a1ebd..bb29db03540e 100644
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -149,6 +149,7 @@ static struct udma_timing {
 static void pdcnew_set_dma_mode(ide_drive_t *drive, const u8 speed)
 {
         ide_hwif_t *hwif        = HWIF(drive);
+        struct pci_dev *dev     = to_pci_dev(hwif->dev);
         u8 adj                  = (drive->dn & 1) ? 0x08 : 0x00;
 
         /*
@@ -159,7 +160,7 @@ static void pdcnew_set_dma_mode(ide_drive_t *drive, const u8 speed)
          * As we set up the PLL to output 133 MHz for UltraDMA/133 capable
          * chips, we must override the default register settings...
          */
-        if (max_dma_rate(hwif->pci_dev) == 4) {
+        if (max_dma_rate(dev) == 4) {
                 u8 mode = speed & 0x07;
 
                 if (speed >= XFER_UDMA_0) {
@@ -186,9 +187,10 @@ static void pdcnew_set_dma_mode(ide_drive_t *drive, const u8 speed)
 static void pdcnew_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
         ide_hwif_t *hwif = drive->hwif;
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
         u8 adj = (drive->dn & 1) ? 0x08 : 0x00;
 
-        if (max_dma_rate(hwif->pci_dev) == 4) {
+        if (max_dma_rate(dev) == 4) {
                 set_indexed_reg(hwif, 0x0c + adj, pio_timings[pio].reg0c);
                 set_indexed_reg(hwif, 0x0d + adj, pio_timings[pio].reg0d);
                 set_indexed_reg(hwif, 0x13 + adj, pio_timings[pio].reg13);
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index ea66383c5579..df1c5fa44a7c 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -66,7 +66,7 @@ static void pdc_old_disable_66MHz_clock(ide_hwif_t *);
 static void pdc202xx_set_mode(ide_drive_t *drive, const u8 speed)
 {
         ide_hwif_t *hwif        = HWIF(drive);
-        struct pci_dev *dev     = hwif->pci_dev;
+        struct pci_dev *dev     = to_pci_dev(hwif->dev);
         u8 drive_pci            = 0x60 + (drive->dn << 2);
 
         u8                      AP = 0, BP = 0, CP = 0;
@@ -144,9 +144,10 @@ static void pdc202xx_set_pio_mode(ide_drive_t *drive, const u8 pio)
 
 static u8 pdc202xx_old_cable_detect (ide_hwif_t *hwif)
 {
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
         u16 CIS = 0, mask = (hwif->channel) ? (1<<11) : (1<<10);
 
-        pci_read_config_word(hwif->pci_dev, 0x50, &CIS);
+        pci_read_config_word(dev, 0x50, &CIS);
 
         return (CIS & mask) ? ATA_CBL_PATA40 : ATA_CBL_PATA80;
 }
@@ -305,12 +306,14 @@ static unsigned int __devinit init_chipset_pdc202xx(struct pci_dev *dev,
 
 static void __devinit init_hwif_pdc202xx(ide_hwif_t *hwif)
 {
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
+
         hwif->set_pio_mode = &pdc202xx_set_pio_mode;
         hwif->set_dma_mode = &pdc202xx_set_mode;
 
         hwif->quirkproc = &pdc202xx_quirkproc;
 
-        if (hwif->pci_dev->device != PCI_DEVICE_ID_PROMISE_20246)
+        if (dev->device != PCI_DEVICE_ID_PROMISE_20246)
                 hwif->resetproc = &pdc202xx_reset;
 
         if (hwif->dma_base == 0)
@@ -319,7 +322,7 @@ static void __devinit init_hwif_pdc202xx(ide_hwif_t *hwif)
         hwif->dma_lost_irq = &pdc202xx_dma_lost_irq;
         hwif->dma_timeout = &pdc202xx_dma_timeout;
 
-        if (hwif->pci_dev->device != PCI_DEVICE_ID_PROMISE_20246) {
+        if (dev->device != PCI_DEVICE_ID_PROMISE_20246) {
                 if (hwif->cbl != ATA_CBL_PATA40_SHORT)
                         hwif->cbl = pdc202xx_old_cable_detect(hwif);
 
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
index 70dc8792b44c..715cfd201847 100644
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -71,7 +71,7 @@ static int no_piix_dma;
 static void piix_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
         ide_hwif_t *hwif        = HWIF(drive);
-        struct pci_dev *dev     = hwif->pci_dev;
+        struct pci_dev *dev     = to_pci_dev(hwif->dev);
         int is_slave            = drive->dn & 1;
         int master_port         = hwif->channel ? 0x42 : 0x40;
         int slave_port          = 0x44;
@@ -140,7 +140,7 @@ static void piix_set_pio_mode(ide_drive_t *drive, const u8 pio)
 static void piix_set_dma_mode(ide_drive_t *drive, const u8 speed)
 {
         ide_hwif_t *hwif        = HWIF(drive);
-        struct pci_dev *dev     = hwif->pci_dev;
+        struct pci_dev *dev     = to_pci_dev(hwif->dev);
         u8 maslave              = hwif->channel ? 0x42 : 0x40;
         int a_speed             = 3 << (drive->dn * 4);
         int u_flag              = 1 << drive->dn;
@@ -260,7 +260,7 @@ static const struct ich_laptop ich_laptop[] = {
 
 static u8 __devinit piix_cable_detect(ide_hwif_t *hwif)
 {
-        struct pci_dev *pdev = hwif->pci_dev;
+        struct pci_dev *pdev = to_pci_dev(hwif->dev);
         const struct ich_laptop *lap = &ich_laptop[0];
         u8 reg54h = 0, mask = hwif->channel ? 0xc0 : 0x30;
 
diff --git a/drivers/ide/pci/rz1000.c b/drivers/ide/pci/rz1000.c
index 6b10ae260fa2..1d3b2f3a8cbb 100644
--- a/drivers/ide/pci/rz1000.c
+++ b/drivers/ide/pci/rz1000.c
@@ -32,8 +32,8 @@
 
 static void __devinit init_hwif_rz1000 (ide_hwif_t *hwif)
 {
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
         u16 reg;
-        struct pci_dev *dev = hwif->pci_dev;
 
         if (!pci_read_config_word (dev, 0x40, &reg) &&
             !pci_write_config_word(dev, 0x40, reg & 0xdfff)) {
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c
index 32fdf53379f5..c2eac1c69ae8 100644
--- a/drivers/ide/pci/sc1200.c
+++ b/drivers/ide/pci/sc1200.c
@@ -87,7 +87,7 @@ static const unsigned int sc1200_pio_timings[4][5] =
 static void sc1200_tunepio(ide_drive_t *drive, u8 pio)
 {
         ide_hwif_t *hwif = drive->hwif;
-        struct pci_dev *pdev = hwif->pci_dev;
+        struct pci_dev *pdev = to_pci_dev(hwif->dev);
         unsigned int basereg = hwif->channel ? 0x50 : 0x40, format = 0;
 
         pci_read_config_dword(pdev, basereg + 4, &format);
@@ -130,6 +130,7 @@ out:
 static void sc1200_set_dma_mode(ide_drive_t *drive, const u8 mode)
 {
         ide_hwif_t              *hwif = HWIF(drive);
+        struct pci_dev          *dev = to_pci_dev(hwif->dev);
         int                     unit = drive->select.b.unit;
         unsigned int            reg, timings;
         unsigned short          pci_clock;
@@ -160,12 +161,11 @@ static void sc1200_set_dma_mode(ide_drive_t *drive, const u8 mode)
                 timings = mwdma_timing[pci_clock][mode - XFER_MW_DMA_0];
 
         if (unit == 0) {                        /* are we configuring drive0? */
-                pci_read_config_dword(hwif->pci_dev, basereg+4, &reg);
+                pci_read_config_dword(dev, basereg + 4, &reg);
                 timings |= reg & 0x80000000;    /* preserve PIO format bit */
-                pci_write_config_dword(hwif->pci_dev, basereg+4, timings);
-        } else {
-                pci_write_config_dword(hwif->pci_dev, basereg+12, timings);
-        }
+                pci_write_config_dword(dev, basereg + 4, timings);
+        } else
+                pci_write_config_dword(dev, basereg + 12, timings);
 }
 
 /*  Replacement for the standard ide_dma_end action in
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index 24a85bbcd2a6..7694969b02ce 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -594,7 +594,7 @@ static int __devinit init_setup_scc(struct pci_dev *dev,
 
 static void __devinit init_mmio_iops_scc(ide_hwif_t *hwif)
 {
-        struct pci_dev *dev = hwif->pci_dev;
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
         struct scc_ports *ports = pci_get_drvdata(dev);
         unsigned long dma_base = ports->dma;
 
@@ -620,7 +620,7 @@ static void __devinit init_mmio_iops_scc(ide_hwif_t *hwif)
         hwif->io_ports[IDE_STATUS_OFFSET] = dma_base + 0x3c;
         hwif->io_ports[IDE_CONTROL_OFFSET] = dma_base + 0x40;
 
-        hwif->irq = hwif->pci_dev->irq;
+        hwif->irq = dev->irq;
         hwif->dma_base = dma_base;
         hwif->config_data = ports->ctl;
         hwif->mmio = 1;
@@ -636,7 +636,8 @@ static void __devinit init_mmio_iops_scc(ide_hwif_t *hwif)
 
 static void __devinit init_iops_scc(ide_hwif_t *hwif)
 {
-        struct pci_dev *dev =  hwif->pci_dev;
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
+
         hwif->hwif_data = NULL;
         if (pci_get_drvdata(dev) == NULL)
                 return;
@@ -726,10 +727,8 @@ static void __devexit scc_remove(struct pci_dev *dev)
         unsigned long dma_size = pci_resource_len(dev, 1);
 
         if (hwif->dmatable_cpu) {
-                pci_free_consistent(hwif->pci_dev,
-                                    PRD_ENTRIES * PRD_BYTES,
-                                    hwif->dmatable_cpu,
-                                    hwif->dmatable_dma);
+                pci_free_consistent(dev, PRD_ENTRIES * PRD_BYTES,
+                                    hwif->dmatable_cpu, hwif->dmatable_dma);
                 hwif->dmatable_cpu = NULL;
         }
 
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c
index bf01c387739e..cb10dfa71f5c 100644
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -67,7 +67,7 @@ static int check_in_drive_lists (ide_drive_t *drive, const char **list)
 
 static u8 svwks_udma_filter(ide_drive_t *drive)
 {
-        struct pci_dev *dev     = HWIF(drive)->pci_dev;
+        struct pci_dev *dev = to_pci_dev(drive->hwif->dev);
         u8 mask = 0;
 
         if (dev->device == PCI_DEVICE_ID_SERVERWORKS_HT1000IDE)
@@ -130,7 +130,7 @@ static void svwks_set_pio_mode(ide_drive_t *drive, const u8 pio)
         static const u8 pio_modes[] = { 0x5d, 0x47, 0x34, 0x22, 0x20 };
         static const u8 drive_pci[] = { 0x41, 0x40, 0x43, 0x42 };
 
-        struct pci_dev *dev = drive->hwif->pci_dev;
+        struct pci_dev *dev = to_pci_dev(drive->hwif->dev);
 
         pci_write_config_byte(dev, drive_pci[drive->dn], pio_modes[pio]);
 
@@ -153,7 +153,7 @@ static void svwks_set_dma_mode(ide_drive_t *drive, const u8 speed)
         static const u8 drive_pci2[]            = { 0x45, 0x44, 0x47, 0x46 };
 
         ide_hwif_t *hwif        = HWIF(drive);
-        struct pci_dev *dev     = hwif->pci_dev;
+        struct pci_dev *dev     = to_pci_dev(hwif->dev);
         u8 unit                 = (drive->select.b.unit & 0x01);
 
         u8 ultra_enable  = 0, ultra_timing = 0, dma_timing = 0;
@@ -287,7 +287,8 @@ static u8 __devinit ata66_svwks_svwks(ide_hwif_t *hwif)
  */
 static u8 __devinit ata66_svwks_dell(ide_hwif_t *hwif)
 {
-        struct pci_dev *dev = hwif->pci_dev;
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
+
         if (dev->subsystem_vendor == PCI_VENDOR_ID_DELL &&
             dev->vendor == PCI_VENDOR_ID_SERVERWORKS &&
             (dev->device == PCI_DEVICE_ID_SERVERWORKS_CSB5IDE ||
@@ -305,7 +306,8 @@ static u8 __devinit ata66_svwks_dell(ide_hwif_t *hwif)
  */
 static u8 __devinit ata66_svwks_cobalt(ide_hwif_t *hwif)
 {
-        struct pci_dev *dev = hwif->pci_dev;
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
+
         if (dev->subsystem_vendor == PCI_VENDOR_ID_SUN &&
             dev->vendor == PCI_VENDOR_ID_SERVERWORKS &&
             dev->device == PCI_DEVICE_ID_SERVERWORKS_CSB5IDE)
@@ -316,7 +318,7 @@ static u8 __devinit ata66_svwks_cobalt(ide_hwif_t *hwif)
 
 static u8 __devinit ata66_svwks(ide_hwif_t *hwif)
 {
-        struct pci_dev *dev = hwif->pci_dev;
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
 
         /* Server Works */
         if (dev->subsystem_vendor == PCI_VENDOR_ID_SERVERWORKS)
@@ -340,6 +342,8 @@ static u8 __devinit ata66_svwks(ide_hwif_t *hwif)
 
 static void __devinit init_hwif_svwks (ide_hwif_t *hwif)
 {
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
+
         hwif->set_pio_mode = &svwks_set_pio_mode;
         hwif->set_dma_mode = &svwks_set_dma_mode;
         hwif->udma_filter = &svwks_udma_filter;
@@ -347,7 +351,7 @@ static void __devinit init_hwif_svwks (ide_hwif_t *hwif)
         if (!hwif->dma_base)
                 return;
 
-        if (hwif->pci_dev->device != PCI_DEVICE_ID_SERVERWORKS_OSB4IDE) {
+        if (dev->device != PCI_DEVICE_ID_SERVERWORKS_OSB4IDE) {
                 if (hwif->cbl != ATA_CBL_PATA40_SHORT)
                         hwif->cbl = ata66_svwks(hwif);
         }
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index b60a5e8860cd..85902074b1fc 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -159,6 +159,7 @@ sgiioc4_clearirq(ide_drive_t * drive)
                 }
 
                 if (intr_reg & 0x02) {
+                        struct pci_dev *dev = to_pci_dev(hwif->dev);
                         /* Error when transferring DMA data on PCI bus */
                         u32 pci_err_addr_low, pci_err_addr_high,
                             pci_stat_cmd_reg;
@@ -167,7 +168,7 @@ sgiioc4_clearirq(ide_drive_t * drive)
                                 readl((void __iomem *)hwif->io_ports[IDE_IRQ_OFFSET]);
                         pci_err_addr_high =
                                 readl((void __iomem *)(hwif->io_ports[IDE_IRQ_OFFSET] + 4));
-                        pci_read_config_dword(hwif->pci_dev, PCI_COMMAND,
+                        pci_read_config_dword(dev, PCI_COMMAND,
                                               &pci_stat_cmd_reg);
                         printk(KERN_ERR
                                "%s(%s) : PCI Bus Error when doing DMA:"
@@ -178,8 +179,7 @@ sgiioc4_clearirq(ide_drive_t * drive)
                                __FUNCTION__, drive->name,
                                pci_err_addr_high, pci_err_addr_low);
                         /* Clear the PCI Error indicator */
-                        pci_write_config_dword(hwif->pci_dev, PCI_COMMAND,
-                                               0x00000146);
+                        pci_write_config_dword(dev, PCI_COMMAND, 0x00000146);
                 }
 
                 /* Clear the Interrupt, Error bits on the IOC4 */
@@ -334,6 +334,7 @@ sgiioc4_INB(unsigned long port)
 static int __devinit
 ide_dma_sgiioc4(ide_hwif_t * hwif, unsigned long dma_base)
 {
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
         void __iomem *virt_dma_base;
         int num_ports = sizeof (ioc4_dma_regs_t);
         void *pad;
@@ -359,7 +360,7 @@ ide_dma_sgiioc4(ide_hwif_t * hwif, unsigned long dma_base)
         }
         hwif->dma_base = (unsigned long) virt_dma_base;
 
-        hwif->dmatable_cpu = pci_alloc_consistent(hwif->pci_dev,
+        hwif->dmatable_cpu = pci_alloc_consistent(dev,
                                           IOC4_PRD_ENTRIES * IOC4_PRD_BYTES,
                                           &hwif->dmatable_dma);
 
@@ -368,7 +369,7 @@ ide_dma_sgiioc4(ide_hwif_t * hwif, unsigned long dma_base)
 
         hwif->sg_max_nents = IOC4_PRD_ENTRIES;
 
-        pad = pci_alloc_consistent(hwif->pci_dev, IOC4_IDE_CACHELINE_SIZE,
+        pad = pci_alloc_consistent(dev, IOC4_IDE_CACHELINE_SIZE,
                                    (dma_addr_t *) &(hwif->dma_status));
 
         if (pad) {
@@ -376,8 +377,7 @@ ide_dma_sgiioc4(ide_hwif_t * hwif, unsigned long dma_base)
                 return 0;
         }
 
-        pci_free_consistent(hwif->pci_dev,
-                            IOC4_PRD_ENTRIES * IOC4_PRD_BYTES,
+        pci_free_consistent(dev, IOC4_PRD_ENTRIES * IOC4_PRD_BYTES,
                             hwif->dmatable_cpu, hwif->dmatable_dma);
         printk(KERN_INFO
                "%s() -- Error! Unable to allocate DMA Maps for drive %s\n",
@@ -640,7 +640,7 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
         hw.dev = &dev->dev;
         ide_init_port_hw(hwif, &hw);
 
-        hwif->pci_dev = dev;
+        hwif->dev = &dev->dev;
         hwif->channel = 0;      /* Single Channel chip */
 
         /* The IOC4 uses MMIO rather than Port IO. */
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index 908f37b4e0ee..391eea88c760 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -79,7 +79,7 @@ static int pdev_is_sata(struct pci_dev *pdev)
  
 static inline int is_sata(ide_hwif_t *hwif)
 {
-        return pdev_is_sata(hwif->pci_dev);
+        return pdev_is_sata(to_pci_dev(hwif->dev));
 }
 
 /**
@@ -140,13 +140,14 @@ static inline unsigned long siimage_seldev(ide_drive_t *drive, int r)
 static u8 sil_pata_udma_filter(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = drive->hwif;
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
         unsigned long base = (unsigned long) hwif->hwif_data;
         u8 mask = 0, scsc = 0;
 
         if (hwif->mmio)
                 scsc = hwif->INB(base + 0x4A);
         else
-                pci_read_config_byte(hwif->pci_dev, 0x8A, &scsc);
+                pci_read_config_byte(dev, 0x8A, &scsc);
 
         if ((scsc & 0x30) == 0x10)      /* 133 */
                 mask = ATA_UDMA6;
@@ -219,19 +220,21 @@ static void sil_set_pio_mode(ide_drive_t *drive, u8 pio)
                 mode |= (unit ? 0x10 : 0x01);
                 hwif->OUTB(mode, base + addr_mask);
         } else {
-                pci_write_config_word(hwif->pci_dev, addr, speedp);
-                pci_write_config_word(hwif->pci_dev, tfaddr, speedt);
-                pci_read_config_word(hwif->pci_dev, tfaddr-2, &speedp);
+                struct pci_dev *dev = to_pci_dev(hwif->dev);
+
+                pci_write_config_word(dev, addr, speedp);
+                pci_write_config_word(dev, tfaddr, speedt);
+                pci_read_config_word(dev, tfaddr - 2, &speedp);
                 speedp &= ~0x200;
                 /* Set IORDY for mode 3 or 4 */
                 if (pio > 2)
                         speedp |= 0x200;
-                pci_write_config_word(hwif->pci_dev, tfaddr-2, speedp);
+                pci_write_config_word(dev, tfaddr - 2, speedp);
 
-                pci_read_config_byte(hwif->pci_dev, addr_mask, &mode);
+                pci_read_config_byte(dev, addr_mask, &mode);
                 mode &= ~(unit ? 0x30 : 0x03);
                 mode |= (unit ? 0x10 : 0x01);
-                pci_write_config_byte(hwif->pci_dev, addr_mask, mode);
+                pci_write_config_byte(dev, addr_mask, mode);
         }
 }
 
@@ -250,6 +253,7 @@ static void sil_set_dma_mode(ide_drive_t *drive, const u8 speed)
         u16 dma[]               = { 0x2208, 0x10C2, 0x10C1 };
 
         ide_hwif_t *hwif        = HWIF(drive);
+        struct pci_dev *dev     = to_pci_dev(hwif->dev);
         u16 ultra = 0, multi    = 0;
         u8 mode = 0, unit       = drive->select.b.unit;
         unsigned long base      = (unsigned long)hwif->hwif_data;
@@ -266,10 +270,10 @@ static void sil_set_dma_mode(ide_drive_t *drive, const u8 speed)
                 multi = hwif->INW(ma);
                 ultra = hwif->INW(ua);
         } else {
-                pci_read_config_byte(hwif->pci_dev, 0x8A, &scsc);
-                pci_read_config_byte(hwif->pci_dev, addr_mask, &mode);
-                pci_read_config_word(hwif->pci_dev, ma, &multi);
-                pci_read_config_word(hwif->pci_dev, ua, &ultra);
+                pci_read_config_byte(dev, 0x8A, &scsc);
+                pci_read_config_byte(dev, addr_mask, &mode);
+                pci_read_config_word(dev, ma, &multi);
+                pci_read_config_word(dev, ua, &ultra);
         }
 
         mode &= ~((unit) ? 0x30 : 0x03);
@@ -293,9 +297,9 @@ static void sil_set_dma_mode(ide_drive_t *drive, const u8 speed)
                 hwif->OUTW(multi, ma);
                 hwif->OUTW(ultra, ua);
         } else {
-                pci_write_config_byte(hwif->pci_dev, addr_mask, mode);
-                pci_write_config_word(hwif->pci_dev, ma, multi);
-                pci_write_config_word(hwif->pci_dev, ua, ultra);
+                pci_write_config_byte(dev, addr_mask, mode);
+                pci_write_config_word(dev, ma, multi);
+                pci_write_config_word(dev, ua, ultra);
         }
 }
 
@@ -303,6 +307,7 @@ static void sil_set_dma_mode(ide_drive_t *drive, const u8 speed)
 static int siimage_io_ide_dma_test_irq (ide_drive_t *drive)
 {
         ide_hwif_t *hwif        = HWIF(drive);
+        struct pci_dev *dev     = to_pci_dev(hwif->dev);
         u8 dma_altstat          = 0;
         unsigned long addr      = siimage_selreg(hwif, 1);
 
@@ -311,7 +316,7 @@ static int siimage_io_ide_dma_test_irq (ide_drive_t *drive)
                 return 1;
 
         /* return 1 if Device INTR asserted */
-        pci_read_config_byte(hwif->pci_dev, addr, &dma_altstat);
+        pci_read_config_byte(dev, addr, &dma_altstat);
         if (dma_altstat & 8)
                 return 0;       //return 1;
         return 0;
@@ -377,13 +382,14 @@ static int siimage_mmio_ide_dma_test_irq (ide_drive_t *drive)
 static int sil_sata_busproc(ide_drive_t * drive, int state)
 {
         ide_hwif_t *hwif        = HWIF(drive);
+        struct pci_dev *dev     = to_pci_dev(hwif->dev);
         u32 stat_config         = 0;
         unsigned long addr      = siimage_selreg(hwif, 0);
 
         if (hwif->mmio)
                 stat_config = readl((void __iomem *)addr);
         else
-                pci_read_config_dword(hwif->pci_dev, addr, &stat_config);
+                pci_read_config_dword(dev, addr, &stat_config);
 
         switch (state) {
                 case BUSSTATE_ON:
@@ -643,7 +649,7 @@ static unsigned int __devinit init_chipset_siimage(struct pci_dev *dev, const ch
 
 static void __devinit init_mmio_iops_siimage(ide_hwif_t *hwif)
 {
-        struct pci_dev *dev     = hwif->pci_dev;
+        struct pci_dev *dev     = to_pci_dev(hwif->dev);
         void *addr              = pci_get_drvdata(dev);
         u8 ch                   = hwif->channel;
         hw_regs_t               hw;
@@ -756,12 +762,14 @@ static void __devinit sil_quirkproc(ide_drive_t *drive)
 
 static void __devinit init_iops_siimage(ide_hwif_t *hwif)
 {
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
+
         hwif->hwif_data = NULL;
 
         /* Pessimal until we finish probing */
         hwif->rqsize = 15;
 
-        if (pci_get_drvdata(hwif->pci_dev) == NULL)
+        if (pci_get_drvdata(dev) == NULL)
                 return;
 
         init_mmio_iops_siimage(hwif);
@@ -777,11 +785,12 @@ static void __devinit init_iops_siimage(ide_hwif_t *hwif)
 
 static u8 __devinit ata66_siimage(ide_hwif_t *hwif)
 {
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
         unsigned long addr = siimage_selreg(hwif, 0);
         u8 ata66 = 0;
 
-        if (pci_get_drvdata(hwif->pci_dev) == NULL)
-                pci_read_config_byte(hwif->pci_dev, addr, &ata66);
+        if (pci_get_drvdata(dev) == NULL)
+                pci_read_config_byte(dev, addr, &ata66);
         else
                 ata66 = hwif->INB(addr);
 
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index 85d36996e6af..9fb4ba4ee318 100644
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -197,7 +197,7 @@ static char* chipset_capability[] = {
 
 static u8 sis_ata133_get_base(ide_drive_t *drive)
 {
-        struct pci_dev *dev = drive->hwif->pci_dev;
+        struct pci_dev *dev = to_pci_dev(drive->hwif->dev);
         u32 reg54 = 0;
 
         pci_read_config_dword(dev, 0x54, &reg54);
@@ -207,7 +207,7 @@ static u8 sis_ata133_get_base(ide_drive_t *drive)
 
 static void sis_ata16_program_timings(ide_drive_t *drive, const u8 mode)
 {
-        struct pci_dev *dev = drive->hwif->pci_dev;
+        struct pci_dev *dev = to_pci_dev(drive->hwif->dev);
         u16 t1 = 0;
         u8 drive_pci = 0x40 + drive->dn * 2;
 
@@ -230,7 +230,7 @@ static void sis_ata16_program_timings(ide_drive_t *drive, const u8 mode)
 
 static void sis_ata100_program_timings(ide_drive_t *drive, const u8 mode)
 {
-        struct pci_dev *dev = drive->hwif->pci_dev;
+        struct pci_dev *dev = to_pci_dev(drive->hwif->dev);
         u8 t1, drive_pci = 0x40 + drive->dn * 2;
 
         /* timing bits: 7:4 active 3:0 recovery */
@@ -253,7 +253,7 @@ static void sis_ata100_program_timings(ide_drive_t *drive, const u8 mode)
 
 static void sis_ata133_program_timings(ide_drive_t *drive, const u8 mode)
 {
-        struct pci_dev *dev = drive->hwif->pci_dev;
+        struct pci_dev *dev = to_pci_dev(drive->hwif->dev);
         u32 t1 = 0;
         u8 drive_pci = sis_ata133_get_base(drive), clk, idx;
 
@@ -286,7 +286,7 @@ static void sis_program_timings(ide_drive_t *drive, const u8 mode)
 static void config_drive_art_rwp (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 reg4bh               = 0;
         u8 rw_prefetch          = 0;
 
@@ -307,7 +307,7 @@ static void sis_set_pio_mode(ide_drive_t *drive, const u8 pio)
 
 static void sis_ata133_program_udma_timings(ide_drive_t *drive, const u8 mode)
 {
-        struct pci_dev *dev = drive->hwif->pci_dev;
+        struct pci_dev *dev = to_pci_dev(drive->hwif->dev);
         u32 regdw = 0;
         u8 drive_pci = sis_ata133_get_base(drive), clk, idx;
 
@@ -326,7 +326,7 @@ static void sis_ata133_program_udma_timings(ide_drive_t *drive, const u8 mode)
 
 static void sis_ata33_program_udma_timings(ide_drive_t *drive, const u8 mode)
 {
-        struct pci_dev *dev = drive->hwif->pci_dev;
+        struct pci_dev *dev = to_pci_dev(drive->hwif->dev);
         u8 drive_pci = 0x40 + drive->dn * 2, reg = 0, i = chipset_family;
 
         pci_read_config_byte(dev, drive_pci + 1, &reg);
@@ -359,7 +359,7 @@ static void sis_set_dma_mode(ide_drive_t *drive, const u8 speed)
 
 static u8 sis5513_ata133_udma_filter(ide_drive_t *drive)
 {
-        struct pci_dev *dev = drive->hwif->pci_dev;
+        struct pci_dev *dev = to_pci_dev(drive->hwif->dev);
         u32 regdw = 0;
         u8 drive_pci = sis_ata133_get_base(drive);
 
@@ -530,7 +530,7 @@ static const struct sis_laptop sis_laptop[] = {
 
 static u8 __devinit ata66_sis5513(ide_hwif_t *hwif)
 {
-        struct pci_dev *pdev = hwif->pci_dev;
+        struct pci_dev *pdev = to_pci_dev(hwif->dev);
         const struct sis_laptop *lap = &sis_laptop[0];
         u8 ata66 = 0;
 
@@ -545,12 +545,12 @@ static u8 __devinit ata66_sis5513(ide_hwif_t *hwif)
         if (chipset_family >= ATA_133) {
                 u16 regw = 0;
                 u16 reg_addr = hwif->channel ? 0x52: 0x50;
-                pci_read_config_word(hwif->pci_dev, reg_addr, &regw);
+                pci_read_config_word(pdev, reg_addr, &regw);
                 ata66 = (regw & 0x8000) ? 0 : 1;
         } else if (chipset_family >= ATA_66) {
                 u8 reg48h = 0;
                 u8 mask = hwif->channel ? 0x20 : 0x10;
-                pci_read_config_byte(hwif->pci_dev, 0x48, &reg48h);
+                pci_read_config_byte(pdev, 0x48, &reg48h);
                 ata66 = (reg48h & mask) ? 0 : 1;
         }
 
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c
index c7a125b66c29..38a79688abc5 100644
--- a/drivers/ide/pci/sl82c105.c
+++ b/drivers/ide/pci/sl82c105.c
@@ -78,7 +78,7 @@ static unsigned int get_pio_timings(ide_drive_t *drive, u8 pio)
  */
 static void sl82c105_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        struct pci_dev *dev     = HWIF(drive)->pci_dev;
+        struct pci_dev *dev     = to_pci_dev(drive->hwif->dev);
         int reg                 = 0x44 + drive->dn * 4;
         u16 drv_ctrl;
 
@@ -147,7 +147,7 @@ static inline void sl82c105_reset_host(struct pci_dev *dev)
 static void sl82c105_dma_lost_irq(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);
         u32 val, mask           = hwif->channel ? CTRL_IDE_IRQB : CTRL_IDE_IRQA;
         u8 dma_cmd;
 
@@ -184,7 +184,7 @@ static void sl82c105_dma_lost_irq(ide_drive_t *drive)
 static void sl82c105_dma_start(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);
         int reg                 = 0x44 + drive->dn * 4;
 
         DBG(("%s(drive:%s)\n", __FUNCTION__, drive->name));
@@ -197,15 +197,17 @@ static void sl82c105_dma_start(ide_drive_t *drive)
 
 static void sl82c105_dma_timeout(ide_drive_t *drive)
 {
+        struct pci_dev *dev = to_pci_dev(drive->hwif->dev);
+
         DBG(("sl82c105_dma_timeout(drive:%s)\n", drive->name));
 
-        sl82c105_reset_host(HWIF(drive)->pci_dev);
+        sl82c105_reset_host(dev);
         ide_dma_timeout(drive);
 }
 
 static int sl82c105_dma_end(ide_drive_t *drive)
 {
-        struct pci_dev *dev     = HWIF(drive)->pci_dev;
+        struct pci_dev *dev     = to_pci_dev(drive->hwif->dev);
         int reg                 = 0x44 + drive->dn * 4;
         int ret;
 
@@ -224,7 +226,7 @@ static int sl82c105_dma_end(ide_drive_t *drive)
  */
 static void sl82c105_resetproc(ide_drive_t *drive)
 {
-        struct pci_dev *dev = HWIF(drive)->pci_dev;
+        struct pci_dev *dev = to_pci_dev(drive->hwif->dev);
         u32 val;
 
         DBG(("sl82c105_resetproc(drive:%s)\n", drive->name));
@@ -293,6 +295,7 @@ static unsigned int __devinit init_chipset_sl82c105(struct pci_dev *dev, const c
  */
 static void __devinit init_hwif_sl82c105(ide_hwif_t *hwif)
 {
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
         unsigned int rev;
 
         DBG(("init_hwif_sl82c105(hwif: ide%d)\n", hwif->index));
@@ -304,7 +307,7 @@ static void __devinit init_hwif_sl82c105(ide_hwif_t *hwif)
         if (!hwif->dma_base)
                 return;
 
-        rev = sl82c105_bridge_revision(hwif->pci_dev);
+        rev = sl82c105_bridge_revision(dev);
         if (rev <= 5) {
                 /*
                  * Never ever EVER under any circumstances enable
diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c
index dbbb46819a2d..c6a3b9f65ff4 100644
--- a/drivers/ide/pci/slc90e66.c
+++ b/drivers/ide/pci/slc90e66.c
@@ -26,7 +26,7 @@ static DEFINE_SPINLOCK(slc90e66_lock);
 static void slc90e66_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
         ide_hwif_t *hwif        = HWIF(drive);
-        struct pci_dev *dev     = hwif->pci_dev;
+        struct pci_dev *dev     = to_pci_dev(hwif->dev);
         int is_slave            = drive->dn & 1;
         int master_port         = hwif->channel ? 0x42 : 0x40;
         int slave_port          = 0x44;
@@ -79,7 +79,7 @@ static void slc90e66_set_pio_mode(ide_drive_t *drive, const u8 pio)
 static void slc90e66_set_dma_mode(ide_drive_t *drive, const u8 speed)
 {
         ide_hwif_t *hwif        = HWIF(drive);
-        struct pci_dev *dev     = hwif->pci_dev;
+        struct pci_dev *dev     = to_pci_dev(hwif->dev);
         u8 maslave              = hwif->channel ? 0x42 : 0x40;
         int sitre = 0, a_speed  = 7 << (drive->dn * 4);
         int u_speed = 0, u_flag = 1 << drive->dn;
@@ -122,13 +122,14 @@ static void slc90e66_set_dma_mode(ide_drive_t *drive, const u8 speed)
 
 static void __devinit init_hwif_slc90e66 (ide_hwif_t *hwif)
 {
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
         u8 reg47 = 0;
         u8 mask = hwif->channel ? 0x01 : 0x02;  /* bit0:Primary */
 
         hwif->set_pio_mode = &slc90e66_set_pio_mode;
         hwif->set_dma_mode = &slc90e66_set_dma_mode;
 
-        pci_read_config_byte(hwif->pci_dev, 0x47, &reg47);
+        pci_read_config_byte(dev, 0x47, &reg47);
 
         if (hwif->dma_base == 0)
                 return;
diff --git a/drivers/ide/pci/tc86c001.c b/drivers/ide/pci/tc86c001.c
index e1faf6c2fe16..ea84b9ea7800 100644
--- a/drivers/ide/pci/tc86c001.c
+++ b/drivers/ide/pci/tc86c001.c
@@ -164,7 +164,8 @@ static int tc86c001_busproc(ide_drive_t *drive, int state)
 
 static void __devinit init_hwif_tc86c001(ide_hwif_t *hwif)
 {
-        unsigned long sc_base   = pci_resource_start(hwif->pci_dev, 5);
+        struct pci_dev *dev     = to_pci_dev(hwif->dev);
+        unsigned long sc_base   = pci_resource_start(dev, 5);
         u16 scr1                = inw(sc_base + 0x00);
 
         /* System Control 1 Register bit 15 (Soft Reset) set */
diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c
index ae52a96a1cf9..ca49cd7f9555 100644
--- a/drivers/ide/pci/triflex.c
+++ b/drivers/ide/pci/triflex.c
@@ -43,7 +43,7 @@
 static void triflex_set_mode(ide_drive_t *drive, const u8 speed)
 {
         ide_hwif_t *hwif = HWIF(drive);
-        struct pci_dev *dev = hwif->pci_dev;
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
         u8 channel_offset = hwif->channel ? 0x74 : 0x70;
         u16 timing = 0;
         u32 triflex_timings = 0;
diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c
index 7b0338890699..0a29d508168f 100644
--- a/drivers/ide/pci/trm290.c
+++ b/drivers/ide/pci/trm290.c
@@ -245,7 +245,7 @@ static void trm290_dma_host_set(ide_drive_t *drive, int on)
 
 static void __devinit init_hwif_trm290(ide_hwif_t *hwif)
 {
-        struct pci_dev *dev     = hwif->pci_dev;
+        struct pci_dev *dev     = to_pci_dev(hwif->dev);
         unsigned int  cfg_base  = pci_resource_start(dev, 4);
         unsigned long flags;
         u8 reg = 0;
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index 4b32c90f4896..37de25b16b34 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -121,8 +121,8 @@ struct via82cxxx_dev
 
 static void via_set_speed(ide_hwif_t *hwif, u8 dn, struct ide_timing *timing)
 {
-        struct pci_dev *dev = hwif->pci_dev;
-        struct via82cxxx_dev *vdev = pci_get_drvdata(hwif->pci_dev);
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
+        struct via82cxxx_dev *vdev = pci_get_drvdata(dev);
         u8 t;
 
         if (~vdev->via_config->flags & VIA_BAD_AST) {
@@ -159,8 +159,10 @@ static void via_set_speed(ide_hwif_t *hwif, u8 dn, struct ide_timing *timing)
 
 static void via_set_drive(ide_drive_t *drive, const u8 speed)
 {
-        ide_drive_t *peer = HWIF(drive)->drives + (~drive->dn & 1);
-        struct via82cxxx_dev *vdev = pci_get_drvdata(drive->hwif->pci_dev);
+        ide_hwif_t *hwif = drive->hwif;
+        ide_drive_t *peer = hwif->drives + (~drive->dn & 1);
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
+        struct via82cxxx_dev *vdev = pci_get_drvdata(dev);
         struct ide_timing t, p;
         unsigned int T, UT;
 
@@ -408,7 +410,7 @@ static int via_cable_override(struct pci_dev *pdev)
 
 static u8 __devinit via82cxxx_cable_detect(ide_hwif_t *hwif)
 {
-        struct pci_dev *pdev = hwif->pci_dev;
+        struct pci_dev *pdev = to_pci_dev(hwif->dev);
         struct via82cxxx_dev *vdev = pci_get_drvdata(pdev);
 
         if (via_cable_override(pdev))
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index 1d6af8824219..b17e097650b1 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -1200,7 +1200,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match)
         base = ioremap(macio_resource_start(mdev, 0), 0x400);
         regbase = (unsigned long) base;
 
-        hwif->pci_dev = mdev->bus->pdev;
+        hwif->dev = &mdev->bus->pdev->dev;
 
         pmif->mdev = mdev;
         pmif->node = mdev->ofdev.node;
@@ -1315,7 +1315,7 @@ pmac_ide_pci_attach(struct pci_dev *pdev, const struct pci_device_id *id)
                 return -ENXIO;
         }
 
-        hwif->pci_dev = pdev;
+        hwif->dev = &pdev->dev;
         pmif->mdev = NULL;
         pmif->node = np;
 
@@ -1725,10 +1725,12 @@ pmac_ide_dma_lost_irq (ide_drive_t *drive)
 static void __devinit
 pmac_ide_setup_dma(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
 {
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
+
         /* We won't need pci_dev if we switch to generic consistent
          * DMA routines ...
          */
-        if (hwif->pci_dev == NULL)
+        if (dev == NULL)
                 return;
         /*
          * Allocate space for the DBDMA commands.
@@ -1736,7 +1738,7 @@ pmac_ide_setup_dma(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
          * aligning the start address to a multiple of 16 bytes.
          */
         pmif->dma_table_cpu = (struct dbdma_cmd*)pci_alloc_consistent(
-                hwif->pci_dev,
+                dev,
                 (MAX_DCMDS + 2) * sizeof(struct dbdma_cmd),
                 &hwif->dmatable_dma);
         if (pmif->dma_table_cpu == NULL) {
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index 0a4b3a6857e1..6b41d6c2433e 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -162,8 +162,8 @@ static void ide_pci_clear_simplex(unsigned long dma_base, const char *name)
 
 static unsigned long ide_get_or_set_dma_base(const struct ide_port_info *d, ide_hwif_t *hwif)
 {
-        unsigned long   dma_base = 0;
-        struct pci_dev  *dev = hwif->pci_dev;
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
+        unsigned long dma_base = 0;
         u8 dma_stat = 0;
 
         if (hwif->mmio)
@@ -391,7 +391,7 @@ static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev, const struct ide_port
 
         hwif->noprobe = oldnoprobe;
 
-        hwif->pci_dev = dev;
+        hwif->dev = &dev->dev;
         hwif->cds = d;
         hwif->channel = port;