--- drivers/ide/cmd640.c

+++ drivers/ide/cmd640.c

@@ -632,12 +632,10 @@ static void cmd640_init_dev(ide_drive_t

static int cmd640_test_irq(ide_hwif_t *hwif)

{

- struct pci_dev *dev = to_pci_dev(hwif->dev);

int irq_reg = hwif->channel ? ARTTIM23 : CFR;

- u8 irq_stat, irq_mask = hwif->channel ? ARTTIM23_IDE23INTR :

+ u8 irq_mask = hwif->channel ? ARTTIM23_IDE23INTR :

CFR_IDE01INTR;

-

- pci_read_config_byte(dev, irq_reg, &irq_stat);

+ u8 irq_stat = get_cmd640_reg(irq_reg);

return (irq_stat & irq_mask) ? 1 : 0;

}