* [PATCH 12/13] ide: move drive->using_dma check to callers of ->dma_host_on method
@ 2007-11-12 23:02 Bartlomiej Zolnierkiewicz
2007-11-13 11:23 ` Sergei Shtylyov
0 siblings, 1 reply; 3+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2007-11-12 23:02 UTC (permalink / raw)
To: linux-ide
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
drivers/ide/ide-dma.c | 2 +-
drivers/ide/ide-iops.c | 3 ++-
drivers/ide/pci/cs5520.c | 3 +--
drivers/ide/pci/sc1200.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
Index: b/drivers/ide/ide-dma.c
===================================================================
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -470,7 +470,7 @@ EXPORT_SYMBOL(ide_dma_off);
void ide_dma_host_on(ide_drive_t *drive)
{
- if (drive->using_dma) {
+ if (1) {
ide_hwif_t *hwif = HWIF(drive);
u8 unit = (drive->select.b.unit & 0x01);
u8 dma_stat = hwif->INB(hwif->dma_status);
Index: b/drivers/ide/ide-iops.c
===================================================================
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -791,7 +791,8 @@ int ide_config_drive_speed(ide_drive_t *
drive->id->dma_1word &= ~0x0F00;
#ifdef CONFIG_BLK_DEV_IDEDMA
- if (speed >= XFER_SW_DMA_0 || (hwif->host_flags & IDE_HFLAG_VDMA))
+ if ((speed >= XFER_SW_DMA_0 || (hwif->host_flags & IDE_HFLAG_VDMA)) &&
+ drive->using_dma)
hwif->dma_host_on(drive);
else if (hwif->dma_host_on) /* check if host supports DMA */
ide_dma_off_quietly(drive);
Index: b/drivers/ide/pci/cs5520.c
===================================================================
--- a/drivers/ide/pci/cs5520.c
+++ b/drivers/ide/pci/cs5520.c
@@ -109,8 +109,7 @@ static void cs5520_set_dma_mode(ide_driv
static void cs5520_dma_host_on(ide_drive_t *drive)
{
- if (drive->using_dma)
- drive->vdma = 1;
+ drive->vdma = 1;
ide_dma_host_on(drive);
}
Index: b/drivers/ide/pci/sc1200.c
===================================================================
--- a/drivers/ide/pci/sc1200.c
+++ b/drivers/ide/pci/sc1200.c
@@ -221,7 +221,7 @@ static void sc1200_set_pio_mode(ide_driv
if (mode != -1) {
printk("SC1200: %s: changing (U)DMA mode\n", drive->name);
ide_dma_off_quietly(drive);
- if (ide_set_dma_mode(drive, mode) == 0)
+ if (ide_set_dma_mode(drive, mode) == 0 && drive->using_dma)
hwif->dma_host_on(drive);
return;
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 12/13] ide: move drive->using_dma check to callers of ->dma_host_on method
2007-11-12 23:02 [PATCH 12/13] ide: move drive->using_dma check to callers of ->dma_host_on method Bartlomiej Zolnierkiewicz
@ 2007-11-13 11:23 ` Sergei Shtylyov
2007-11-13 21:27 ` Bartlomiej Zolnierkiewicz
0 siblings, 1 reply; 3+ messages in thread
From: Sergei Shtylyov @ 2007-11-13 11:23 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz; +Cc: linux-ide
Bartlomiej Zolnierkiewicz wrote:
> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
MBR, Sergei
> Index: b/drivers/ide/ide-dma.c
> ===================================================================
> --- a/drivers/ide/ide-dma.c
> +++ b/drivers/ide/ide-dma.c
> @@ -470,7 +470,7 @@ EXPORT_SYMBOL(ide_dma_off);
>
> void ide_dma_host_on(ide_drive_t *drive)
> {
> - if (drive->using_dma) {
> + if (1) {
Why so?
> ide_hwif_t *hwif = HWIF(drive);
> u8 unit = (drive->select.b.unit & 0x01);
> u8 dma_stat = hwif->INB(hwif->dma_status);
WBR, Sergei
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 12/13] ide: move drive->using_dma check to callers of ->dma_host_on method
2007-11-13 11:23 ` Sergei Shtylyov
@ 2007-11-13 21:27 ` Bartlomiej Zolnierkiewicz
0 siblings, 0 replies; 3+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2007-11-13 21:27 UTC (permalink / raw)
To: Sergei Shtylyov; +Cc: linux-ide
On Tuesday 13 November 2007, Sergei Shtylyov wrote:
> Bartlomiej Zolnierkiewicz wrote:
>
> > Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
>
> Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
>
> MBR, Sergei
>
> > Index: b/drivers/ide/ide-dma.c
> > ===================================================================
> > --- a/drivers/ide/ide-dma.c
> > +++ b/drivers/ide/ide-dma.c
> > @@ -470,7 +470,7 @@ EXPORT_SYMBOL(ide_dma_off);
> >
> > void ide_dma_host_on(ide_drive_t *drive)
> > {
> > - if (drive->using_dma) {
> > + if (1) {
>
> Why so?
Just not to move the code around (because it "vanishes" in patch #13/13).
> > ide_hwif_t *hwif = HWIF(drive);
> > u8 unit = (drive->select.b.unit & 0x01);
> > u8 dma_stat = hwif->INB(hwif->dma_status);
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-11-13 21:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-12 23:02 [PATCH 12/13] ide: move drive->using_dma check to callers of ->dma_host_on method Bartlomiej Zolnierkiewicz
2007-11-13 11:23 ` Sergei Shtylyov
2007-11-13 21:27 ` Bartlomiej Zolnierkiewicz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).