Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
pdc202xx_old: fix resetproc() method
pdc202xx_old: fix 'pdc20246_dma_ops'
+6
-16
+6
-16
drivers/ide/pdc202xx_old.c
+6
-16
drivers/ide/pdc202xx_old.c
···
1
1
/*
2
2
* Copyright (C) 1998-2002 Andre Hedrick <andre@linux-ide.org>
3
-
* Copyright (C) 2006-2007 MontaVista Software, Inc.
3
+
* Copyright (C) 2006-2007, 2009 MontaVista Software, Inc.
4
4
* Copyright (C) 2007 Bartlomiej Zolnierkiewicz
5
5
*
6
6
* Portions Copyright (C) 1999 Promise Technology, Inc.
···
227
227
return (dma_stat & 4) == 4; /* return 1 if INTR asserted */
228
228
}
229
229
230
-
static void pdc202xx_reset_host (ide_hwif_t *hwif)
230
+
static void pdc202xx_reset(ide_drive_t *drive)
231
231
{
232
+
ide_hwif_t *hwif = drive->hwif;
232
233
unsigned long high_16 = hwif->extra_base - 16;
233
234
u8 udma_speed_flag = inb(high_16 | 0x001f);
235
+
236
+
printk(KERN_WARNING "PDC202xx: software reset...\n");
234
237
235
238
outb(udma_speed_flag | 0x10, high_16 | 0x001f);
236
239
mdelay(100);
237
240
outb(udma_speed_flag & ~0x10, high_16 | 0x001f);
238
241
mdelay(2000); /* 2 seconds ?! */
239
-
240
-
printk(KERN_WARNING "PDC202XX: %s channel reset.\n",
241
-
hwif->channel ? "Secondary" : "Primary");
242
-
}
243
-
244
-
static void pdc202xx_reset (ide_drive_t *drive)
245
-
{
246
-
ide_hwif_t *hwif = drive->hwif;
247
-
ide_hwif_t *mate = hwif->mate;
248
-
249
-
pdc202xx_reset_host(hwif);
250
-
pdc202xx_reset_host(mate);
251
242
252
243
ide_set_max_pio(drive);
253
244
}
···
319
328
.dma_start = ide_dma_start,
320
329
.dma_end = ide_dma_end,
321
330
.dma_test_irq = pdc202xx_dma_test_irq,
322
-
.dma_lost_irq = pdc202xx_dma_lost_irq,
331
+
.dma_lost_irq = ide_dma_lost_irq,
323
332
.dma_timer_expiry = ide_dma_sff_timer_expiry,
324
-
.dma_clear = pdc202xx_reset,
325
333
.dma_sff_read_status = ide_dma_sff_read_status,
326
334
};
327
335