Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 48827
b: refs/heads/master
c: d8f4469
h: refs/heads/master
i:
  48825: 3b422a9
  48823: 1a5a1f9
v: v3
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Feb 17, 2007
1 parent 2d8f7bd commit 1718eee
Show file tree
Hide file tree
Showing 16 changed files with 44 additions and 72 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2ad1e558a2305c2b3d5099ee2f4a5929307c20ca
refs/heads/master: d8f4469d5f2c35e0b8272f254b42737a2b8ce877
8 changes: 3 additions & 5 deletions trunk/drivers/ide/pci/aec62xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,12 +214,10 @@ static int aec62xx_config_drive_xfer_rate (ide_drive_t *drive)
if (ide_use_dma(drive) && config_chipset_for_dma(drive))
return hwif->ide_dma_on(drive);

if (ide_use_fast_pio(drive)) {
if (ide_use_fast_pio(drive))
aec62xx_tune_drive(drive, 5);
return hwif->ide_dma_off_quietly(drive);
}
/* IORDY not supported */
return 0;

return hwif->ide_dma_off_quietly(drive);
}

static int aec62xx_irq_timeout (ide_drive_t *drive)
Expand Down
5 changes: 2 additions & 3 deletions trunk/drivers/ide/pci/atiixp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,10 +264,9 @@ static int atiixp_dma_check(ide_drive_t *drive)
tspeed = ide_get_best_pio_mode(drive, 255, 5, NULL);
speed = atiixp_dma_2_pio(XFER_PIO_0 + tspeed) + XFER_PIO_0;
hwif->speedproc(drive, speed);
return hwif->ide_dma_off_quietly(drive);
}
/* IORDY not supported */
return 0;

return hwif->ide_dma_off_quietly(drive);
}

/**
Expand Down
8 changes: 3 additions & 5 deletions trunk/drivers/ide/pci/cmd64x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -479,12 +479,10 @@ static int cmd64x_config_drive_for_dma (ide_drive_t *drive)
if (ide_use_dma(drive) && config_chipset_for_dma(drive))
return hwif->ide_dma_on(drive);

if (ide_use_fast_pio(drive)) {
if (ide_use_fast_pio(drive))
config_chipset_for_pio(drive, 1);
return hwif->ide_dma_off_quietly(drive);
}
/* IORDY not supported */
return 0;

return hwif->ide_dma_off_quietly(drive);
}

static int cmd64x_alt_dma_status (struct pci_dev *dev)
Expand Down
5 changes: 2 additions & 3 deletions trunk/drivers/ide/pci/cs5535.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,9 @@ static int cs5535_dma_check(ide_drive_t *drive)
if (ide_use_fast_pio(drive)) {
speed = ide_get_best_pio_mode(drive, 255, 4, NULL);
cs5535_set_drive(drive, speed);
return hwif->ide_dma_off_quietly(drive);
}
/* IORDY not supported */
return 0;

return hwif->ide_dma_off_quietly(drive);
}

static u8 __devinit cs5535_cable_detect(struct pci_dev *dev)
Expand Down
8 changes: 3 additions & 5 deletions trunk/drivers/ide/pci/hpt34x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,10 @@ static int hpt34x_config_drive_xfer_rate (ide_drive_t *drive)
return hwif->ide_dma_on(drive);
#endif

if (ide_use_fast_pio(drive)) {
if (ide_use_fast_pio(drive))
hpt34x_tune_drive(drive, 255);
return hwif->ide_dma_off_quietly(drive);
}
/* IORDY not supported */
return 0;

return hwif->ide_dma_off_quietly(drive);
}

/*
Expand Down
8 changes: 3 additions & 5 deletions trunk/drivers/ide/pci/hpt366.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -743,12 +743,10 @@ static int hpt366_config_drive_xfer_rate(ide_drive_t *drive)
if (ide_use_dma(drive) && config_chipset_for_dma(drive))
return hwif->ide_dma_on(drive);

if (ide_use_fast_pio(drive)) {
if (ide_use_fast_pio(drive))
hpt3xx_tune_drive(drive, 255);
return hwif->ide_dma_off_quietly(drive);
}
/* IORDY not supported */
return 0;

return hwif->ide_dma_off_quietly(drive);
}

/*
Expand Down
8 changes: 3 additions & 5 deletions trunk/drivers/ide/pci/pdc202xx_new.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,12 +288,10 @@ static int pdcnew_config_drive_xfer_rate(ide_drive_t *drive)
if (ide_use_dma(drive) && config_chipset_for_dma(drive))
return hwif->ide_dma_on(drive);

if (ide_use_fast_pio(drive)) {
if (ide_use_fast_pio(drive))
hwif->tuneproc(drive, 255);
return hwif->ide_dma_off_quietly(drive);
}
/* IORDY not supported */
return 0;

return hwif->ide_dma_off_quietly(drive);
}

static int pdcnew_quirkproc(ide_drive_t *drive)
Expand Down
8 changes: 3 additions & 5 deletions trunk/drivers/ide/pci/pdc202xx_old.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,12 +329,10 @@ static int pdc202xx_config_drive_xfer_rate (ide_drive_t *drive)
if (ide_use_dma(drive) && config_chipset_for_dma(drive))
return hwif->ide_dma_on(drive);

if (ide_use_fast_pio(drive)) {
if (ide_use_fast_pio(drive))
pdc202xx_tune_drive(drive, 255);
return hwif->ide_dma_off_quietly(drive);
}
/* IORDY not supported */
return 0;

return hwif->ide_dma_off_quietly(drive);
}

static int pdc202xx_quirkproc (ide_drive_t *drive)
Expand Down
8 changes: 3 additions & 5 deletions trunk/drivers/ide/pci/piix.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -393,14 +393,12 @@ static int piix_config_drive_xfer_rate (ide_drive_t *drive)
if (ide_use_dma(drive) && piix_config_drive_for_dma(drive))
return hwif->ide_dma_on(drive);

if (ide_use_fast_pio(drive)) {
if (ide_use_fast_pio(drive))
/* Find best PIO mode. */
(void) hwif->speedproc(drive, XFER_PIO_0 +
ide_get_best_pio_mode(drive, 255, 4, NULL));
return hwif->ide_dma_off_quietly(drive);
}
/* IORDY not supported */
return 0;

return hwif->ide_dma_off_quietly(drive);
}

/**
Expand Down
9 changes: 3 additions & 6 deletions trunk/drivers/ide/pci/serverworks.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,13 +322,10 @@ static int svwks_config_drive_xfer_rate (ide_drive_t *drive)
if (ide_use_dma(drive) && config_chipset_for_dma(drive))
return hwif->ide_dma_on(drive);

if (ide_use_fast_pio(drive)) {
if (ide_use_fast_pio(drive))
config_chipset_for_pio(drive);
// hwif->tuneproc(drive, 5);
return hwif->ide_dma_off_quietly(drive);
}
/* IORDY not supported */
return 0;

return hwif->ide_dma_off_quietly(drive);
}

static unsigned int __devinit init_chipset_svwks (struct pci_dev *dev, const char *name)
Expand Down
8 changes: 3 additions & 5 deletions trunk/drivers/ide/pci/siimage.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -419,12 +419,10 @@ static int siimage_config_drive_for_dma (ide_drive_t *drive)
if (ide_use_dma(drive) && config_chipset_for_dma(drive))
return hwif->ide_dma_on(drive);

if (ide_use_fast_pio(drive)) {
if (ide_use_fast_pio(drive))
config_chipset_for_pio(drive, 1);
return hwif->ide_dma_off_quietly(drive);
}
/* IORDY not supported */
return 0;

return hwif->ide_dma_off_quietly(drive);
}

/* returns 1 if dma irq issued, 0 otherwise */
Expand Down
8 changes: 3 additions & 5 deletions trunk/drivers/ide/pci/sis5513.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -678,12 +678,10 @@ static int sis5513_config_xfer_rate(ide_drive_t *drive)
if (ide_use_dma(drive) && config_chipset_for_dma(drive))
return hwif->ide_dma_on(drive);

if (ide_use_fast_pio(drive)) {
if (ide_use_fast_pio(drive))
sis5513_tune_drive(drive, 5);
return hwif->ide_dma_off_quietly(drive);
}
/* IORDY not supported */
return 0;

return hwif->ide_dma_off_quietly(drive);
}

/* Chip detection and general config */
Expand Down
8 changes: 3 additions & 5 deletions trunk/drivers/ide/pci/slc90e66.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,13 +186,11 @@ static int slc90e66_config_drive_xfer_rate (ide_drive_t *drive)
if (ide_use_dma(drive) && slc90e66_config_drive_for_dma(drive))
return hwif->ide_dma_on(drive);

if (ide_use_fast_pio(drive)) {
if (ide_use_fast_pio(drive))
(void) hwif->speedproc(drive, XFER_PIO_0 +
ide_get_best_pio_mode(drive, 255, 4, NULL));
return hwif->ide_dma_off_quietly(drive);
}
/* IORDY not supported */
return 0;

return hwif->ide_dma_off_quietly(drive);
}

static void __devinit init_hwif_slc90e66 (ide_hwif_t *hwif)
Expand Down
8 changes: 3 additions & 5 deletions trunk/drivers/ide/pci/tc86c001.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,10 @@ static int tc86c001_config_drive_xfer_rate(ide_drive_t *drive)
if (ide_use_dma(drive) && config_chipset_for_dma(drive))
return hwif->ide_dma_on(drive);

if (ide_use_fast_pio(drive)) {
if (ide_use_fast_pio(drive))
tc86c001_tune_drive(drive, 255);
return hwif->ide_dma_off_quietly(drive);
}
/* IORDY not supported */
return 0;

return hwif->ide_dma_off_quietly(drive);
}

static void __devinit init_hwif_tc86c001(ide_hwif_t *hwif)
Expand Down
7 changes: 3 additions & 4 deletions trunk/drivers/ide/ppc/scc_pata.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,11 +376,10 @@ static int scc_config_drive_for_dma(ide_drive_t *drive)
if (ide_use_dma(drive) && scc_config_chipset_for_dma(drive))
return hwif->ide_dma_on(drive);

if (ide_use_fast_pio(drive)) {
if (ide_use_fast_pio(drive))
hwif->tuneproc(drive, 4);
hwif->ide_dma_off_quietly(drive);
}
return 1; /* DMA is not supported */

return hwif->ide_dma_off_quietly(drive);
}

/**
Expand Down

0 comments on commit 1718eee

Please sign in to comment.