diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-01-07 10:45:25 +0000 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-01-07 10:45:25 +0000 |
| commit | a23e66f3b8cfdedec14541e71ef29a754870a20c (patch) | |
| tree | f8ac23572982e92e6f8ae09c4039db627bdf53ee /drivers/ide/slc90e66.c | |
| parent | 04c470adb01c62bb9bd663cfc4875cf0a4eb01ab (diff) | |
| parent | ede6f5aea054d3fb67c78857f7abdee602302043 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'drivers/ide/slc90e66.c')
| -rw-r--r-- | drivers/ide/slc90e66.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/slc90e66.c b/drivers/ide/slc90e66.c index 0f759e4ed77..40b4b94a428 100644 --- a/drivers/ide/slc90e66.c +++ b/drivers/ide/slc90e66.c @@ -20,7 +20,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); + ide_hwif_t *hwif = drive->hwif; struct pci_dev *dev = to_pci_dev(hwif->dev); int is_slave = drive->dn & 1; int master_port = hwif->channel ? 0x42 : 0x40; @@ -73,7 +73,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); + ide_hwif_t *hwif = drive->hwif; struct pci_dev *dev = to_pci_dev(hwif->dev); u8 maslave = hwif->channel ? 0x42 : 0x40; int sitre = 0, a_speed = 7 << (drive->dn * 4); |