git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
parser: remove unnecessary strlen()
[safe/jmp/linux-2.6]
/
drivers
/
ide
/
sc1200.c
diff --git
a/drivers/ide/sc1200.c
b/drivers/ide/sc1200.c
index
ec7f766
..
d467478
100644
(file)
--- a/
drivers/ide/sc1200.c
+++ b/
drivers/ide/sc1200.c
@@
-115,8
+115,7
@@
static u8 sc1200_udma_filter(ide_drive_t *drive)
if ((mateid[ATA_ID_FIELD_VALID] & 4) &&
(mateid[ATA_ID_UDMA_MODES] & 7))
goto out;
if ((mateid[ATA_ID_FIELD_VALID] & 4) &&
(mateid[ATA_ID_UDMA_MODES] & 7))
goto out;
- if ((mateid[ATA_ID_FIELD_VALID] & 2) &&
- (mateid[ATA_ID_MWDMA_MODES] & 7))
+ if (mateid[ATA_ID_MWDMA_MODES] & 7)
mask = 0;
}
out:
mask = 0;
}
out:
@@
-125,7
+124,7
@@
out:
static void sc1200_set_dma_mode(ide_drive_t *drive, const u8 mode)
{
static void sc1200_set_dma_mode(ide_drive_t *drive, const u8 mode)
{
- ide_hwif_t *hwif =
HWIF(drive)
;
+ ide_hwif_t *hwif =
drive->hwif
;
struct pci_dev *dev = to_pci_dev(hwif->dev);
unsigned int reg, timings;
unsigned short pci_clock;
struct pci_dev *dev = to_pci_dev(hwif->dev);
unsigned int reg, timings;
unsigned short pci_clock;
@@
-170,9
+169,9
@@
static void sc1200_set_dma_mode(ide_drive_t *drive, const u8 mode)
*/
static int sc1200_dma_end(ide_drive_t *drive)
{
*/
static int sc1200_dma_end(ide_drive_t *drive)
{
- ide_hwif_t *hwif =
HWIF(drive)
;
+ ide_hwif_t *hwif =
drive->hwif
;
unsigned long dma_base = hwif->dma_base;
unsigned long dma_base = hwif->dma_base;
-
byte
dma_stat;
+
u8
dma_stat;
dma_stat = inb(dma_base+2); /* get DMA status */
dma_stat = inb(dma_base+2); /* get DMA status */
@@
-183,9
+182,6
@@
static int sc1200_dma_end(ide_drive_t *drive)
outb(dma_stat|0x1b, dma_base+2); /* clear the INTR & ERROR bits */
outb(inb(dma_base)&~1, dma_base); /* !! DO THIS HERE !! stop DMA */
outb(dma_stat|0x1b, dma_base+2); /* clear the INTR & ERROR bits */
outb(inb(dma_base)&~1, dma_base); /* !! DO THIS HERE !! stop DMA */
- drive->waiting_for_dma = 0;
- ide_destroy_dmatable(drive); /* purge DMA mappings */
-
return (dma_stat & 7) != 4; /* verify good DMA status */
}
return (dma_stat & 7) != 4; /* verify good DMA status */
}
@@
-199,7
+195,7
@@
static int sc1200_dma_end(ide_drive_t *drive)
static void sc1200_set_pio_mode(ide_drive_t *drive, const u8 pio)
{
static void sc1200_set_pio_mode(ide_drive_t *drive, const u8 pio)
{
- ide_hwif_t *hwif =
HWIF(drive)
;
+ ide_hwif_t *hwif =
drive->hwif
;
int mode = -1;
/*
int mode = -1;
/*
@@
-286,12
+282,12
@@
static const struct ide_port_ops sc1200_port_ops = {
static const struct ide_dma_ops sc1200_dma_ops = {
.dma_host_set = ide_dma_host_set,
.dma_setup = ide_dma_setup,
static const struct ide_dma_ops sc1200_dma_ops = {
.dma_host_set = ide_dma_host_set,
.dma_setup = ide_dma_setup,
- .dma_exec_cmd = ide_dma_exec_cmd,
.dma_start = ide_dma_start,
.dma_end = sc1200_dma_end,
.dma_test_irq = ide_dma_test_irq,
.dma_lost_irq = ide_dma_lost_irq,
.dma_start = ide_dma_start,
.dma_end = sc1200_dma_end,
.dma_test_irq = ide_dma_test_irq,
.dma_lost_irq = ide_dma_lost_irq,
- .dma_timeout = ide_dma_timeout,
+ .dma_timer_expiry = ide_dma_sff_timer_expiry,
+ .dma_sff_read_status = ide_dma_sff_read_status,
};
static const struct ide_port_info sc1200_chipset __devinitdata = {
};
static const struct ide_port_info sc1200_chipset __devinitdata = {