diff options
Diffstat (limited to 'drivers/ide/pci/cy82c693.c')
-rw-r--r-- | drivers/ide/pci/cy82c693.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c index 3ec4c659a37d..50100ac8770f 100644 --- a/drivers/ide/pci/cy82c693.c +++ b/drivers/ide/pci/cy82c693.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * linux/drivers/ide/pci/cy82c693.c Version 0.44 Nov 8, 2007 | ||
3 | * | ||
4 | * Copyright (C) 1998-2000 Andreas S. Krebs (akrebs@altavista.net), Maintainer | 2 | * Copyright (C) 1998-2000 Andreas S. Krebs (akrebs@altavista.net), Maintainer |
5 | * Copyright (C) 1998-2002 Andre Hedrick <andre@linux-ide.org>, Integrator | 3 | * Copyright (C) 1998-2002 Andre Hedrick <andre@linux-ide.org>, Integrator |
6 | * | 4 | * |
@@ -228,7 +226,7 @@ static void cy82c693_set_dma_mode(ide_drive_t *drive, const u8 mode) | |||
228 | static void cy82c693_set_pio_mode(ide_drive_t *drive, const u8 pio) | 226 | static void cy82c693_set_pio_mode(ide_drive_t *drive, const u8 pio) |
229 | { | 227 | { |
230 | ide_hwif_t *hwif = HWIF(drive); | 228 | ide_hwif_t *hwif = HWIF(drive); |
231 | struct pci_dev *dev = hwif->pci_dev; | 229 | struct pci_dev *dev = to_pci_dev(hwif->dev); |
232 | pio_clocks_t pclk; | 230 | pio_clocks_t pclk; |
233 | unsigned int addrCtrl; | 231 | unsigned int addrCtrl; |
234 | 232 | ||
@@ -397,8 +395,9 @@ static void __devinit init_hwif_cy82c693(ide_hwif_t *hwif) | |||
397 | static void __devinit init_iops_cy82c693(ide_hwif_t *hwif) | 395 | static void __devinit init_iops_cy82c693(ide_hwif_t *hwif) |
398 | { | 396 | { |
399 | static ide_hwif_t *primary; | 397 | static ide_hwif_t *primary; |
398 | struct pci_dev *dev = to_pci_dev(hwif->dev); | ||
400 | 399 | ||
401 | if (PCI_FUNC(hwif->pci_dev->devfn) == 1) | 400 | if (PCI_FUNC(dev->devfn) == 1) |
402 | primary = hwif; | 401 | primary = hwif; |
403 | else { | 402 | else { |
404 | hwif->mate = primary; | 403 | hwif->mate = primary; |