Hi, On Friday 06 February 2009, Stephen Rothwell wrote: > Hi Bart, > > On Sun, 01 Feb 2009 18:50:12 +0100 Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx> wrote: > > > > From: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx> > > Subject: [PATCH] ide: add "flagged" taskfile flags to struct ide_taskfile > > > > * Add ->ftf_flags field to struct ide_taskfile > > and convert flags for TASKFILE ioctl to use it. > > > > * Rename "flagged" taskfile flags: > > - IDE_TFLAG_FLAGGED -> IDE_FTFLAG_FLAGGED > > There were several places where this transformation did not take place as > shown by today's linux-next build. Thanks, it is now fixed with v2 of the patch, interdiff below: ... v2: * Remember to fully update ide-h8300.c, scc_pata.c and tx493{8,9}ide.c (thanks to Stephen Rothwell for noticing). There should be no functional changes caused by this patch. Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx> ... diff -u b/drivers/ide/ide-h8300.c b/drivers/ide/ide-h8300.c --- b/drivers/ide/ide-h8300.c +++ b/drivers/ide/ide-h8300.c @@ -51,7 +51,7 @@ struct ide_taskfile *tf = &task->tf; u8 HIHI = (task->tf_flags & IDE_TFLAG_LBA48) ? 0xE0 : 0xEF; - if (task->tf_flags & IDE_TFLAG_FLAGGED) + if (task->ftf_flags & IDE_FTFLAG_FLAGGED) HIHI = 0xFF; if (task->ftf_flags & IDE_FTFLAG_OUT_DATA) diff -u b/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c --- b/drivers/ide/scc_pata.c +++ b/drivers/ide/scc_pata.c @@ -672,7 +672,7 @@ struct ide_taskfile *tf = &task->tf; u8 HIHI = (task->tf_flags & IDE_TFLAG_LBA48) ? 0xE0 : 0xEF; - if (task->tf_flags & IDE_TFLAG_FLAGGED) + if (task->ftf_flags & IDE_FTFLAG_FLAGGED) HIHI = 0xFF; if (task->ftf_flags & IDE_FTFLAG_OUT_DATA) diff -u b/drivers/ide/tx4938ide.c b/drivers/ide/tx4938ide.c --- b/drivers/ide/tx4938ide.c +++ b/drivers/ide/tx4938ide.c @@ -89,7 +89,7 @@ struct ide_taskfile *tf = &task->tf; u8 HIHI = task->tf_flags & IDE_TFLAG_LBA48 ? 0xE0 : 0xEF; - if (task->tf_flags & IDE_TFLAG_FLAGGED) + if (task->ftf_flags & IDE_FTFLAG_FLAGGED) HIHI = 0xFF; if (task->ftf_flags & IDE_FTFLAG_OUT_DATA) { diff -u b/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c --- b/drivers/ide/tx4939ide.c +++ b/drivers/ide/tx4939ide.c @@ -474,7 +474,7 @@ struct ide_taskfile *tf = &task->tf; u8 HIHI = task->tf_flags & IDE_TFLAG_LBA48 ? 0xE0 : 0xEF; - if (task->tf_flags & IDE_TFLAG_FLAGGED) + if (task->ftf_flags & IDE_FTFLAG_FLAGGED) HIHI = 0xFF; if (task->ftf_flags & IDE_FTFLAG_OUT_DATA) { -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html