5 files changed, 4 insertions, 7 deletions

diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index 31a71136bbae..b38a9dfb3146 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -833,7 +833,7 @@ static int ide_allocate_dma_engine(ide_hwif_t *hwif)
                 return 0;
 
         printk(KERN_ERR "%s: -- Error, unable to allocate DMA table.\n",
-               hwif->cds->name);
+                        hwif->name);
 
         return 1;
 }
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index 06617ab16248..421a1f878efa 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -288,6 +288,7 @@ static void __devinit init_hwif_pdc202xx(ide_hwif_t *hwif)
 
 static void __devinit init_dma_pdc202xx(ide_hwif_t *hwif, unsigned long dmabase)
 {
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
         u8 udma_speed_flag = 0, primary_mode = 0, secondary_mode = 0;
 
         if (hwif->channel) {
@@ -300,14 +301,14 @@ static void __devinit init_dma_pdc202xx(ide_hwif_t *hwif, unsigned long dmabase)
         secondary_mode  = inb(dmabase | 0x1b);
         printk(KERN_INFO "%s: (U)DMA Burst Bit %sABLED " \
                 "Primary %s Mode " \
-                "Secondary %s Mode.\n", hwif->cds->name,
+                "Secondary %s Mode.\n", pci_name(dev),
                 (udma_speed_flag & 1) ? "EN" : "DIS",
                 (primary_mode & 1) ? "MASTER" : "PCI",
                 (secondary_mode & 1) ? "MASTER" : "PCI" );
 
         if (!(udma_speed_flag & 1)) {
                 printk(KERN_INFO "%s: FORCING BURST BIT 0x%02x->0x%02x ",
-                        hwif->cds->name, udma_speed_flag,
+                        pci_name(dev), udma_speed_flag,
                         (udma_speed_flag|1));
                 outb(udma_speed_flag | 1, dmabase | 0x1f);
                 printk("%sACTIVE\n", (inb(dmabase | 0x1f) & 1) ? "" : "IN");
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index e7f8ebc94b05..c30b0c44c705 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -541,7 +541,6 @@ static int scc_ide_setup_pci_device(struct pci_dev *dev,
         hw.chipset = ide_pci;
         ide_init_port_hw(hwif, &hw);
         hwif->dev = &dev->dev;
-        hwif->cds = d;
 
         idx[0] = hwif->index;
 
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index 8812eaa7f169..26997648bf00 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -322,7 +322,6 @@ static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev,
         ide_init_port_hw(hwif, &hw);
 
         hwif->dev = &dev->dev;
-        hwif->cds = d;
 
         return hwif;
 }
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 171f8056d052..989fe78b354f 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -446,8 +446,6 @@ typedef struct hwif_s {
 
         struct device *dev;
 
-        const struct ide_port_info *cds;        /* chipset device struct */
-
         ide_ack_intr_t *ack_intr;
 
         void (*rw_disk)(ide_drive_t *, struct request *);