lkml.org 
[lkml]   [2004]   [Jun]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] IDE update for 2.6.7-rc3 [3/12]
Date

[PATCH] ide: ide-proc fix for m68k

From: Geert Uytterhoeven <geert@linux-m68k.org>

On Sat, 29 May 2004, Linus Torvalds wrote:
> Summary of changes from v2.6.7-rc1 to v2.6.7-rc2
> ============================================
>
> Alexander Viro:
> o sparse: ide-proc.c fixes

This change causes 2 warnings (unused variables `val' and `reg') on m68k
and APUS. However, the reason why this code was commented out is gone.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>

linux-2.6.7-rc3-bzolnier/drivers/ide/ide-proc.c | 22 ----------------------
1 files changed, 22 deletions(-)

diff -puN drivers/ide/ide-proc.c~ide_proc_m68k drivers/ide/ide-proc.c
--- linux-2.6.7-rc3/drivers/ide/ide-proc.c~ide_proc_m68k 2004-06-11 15:47:31.554647472 +0200
+++ linux-2.6.7-rc3-bzolnier/drivers/ide/ide-proc.c 2004-06-11 15:48:21.319082128 +0200
@@ -233,27 +233,6 @@ static int proc_ide_write_config(struct
}
#endif /* CONFIG_BLK_DEV_IDEPCI */
} else { /* not pci */
-#if !defined(__mc68000__) && !defined(CONFIG_APUS)
-
-/*
-* Geert Uytterhoeven
-*
-* unless you can explain me what it really does.
-* On m68k, we don't have outw() and outl() yet,
-* and I need a good reason to implement it.
-*
-* BTW, IMHO the main remaining portability problem with the IDE driver
-* is that it mixes IO (ioport) and MMIO (iomem) access on different platforms.
-*
-* I think all accesses should be done using
-*
-* ide_in[bwl](ide_device_instance, offset)
-* ide_out[bwl](ide_device_instance, value, offset)
-*
-* so the architecture specific code can #define ide_{in,out}[bwl] to the
-* appropriate function.
-*
-*/
switch (r->size) {
case 1: hwif->OUTB(val, reg);
break;
@@ -262,7 +241,6 @@ static int proc_ide_write_config(struct
case 4: hwif->OUTL(val, reg);
break;
}
-#endif /* !__mc68000__ && !CONFIG_APUS */
}
}
spin_unlock_irqrestore(&ide_lock, flags);
_

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 14:03    [W:0.034 / U:0.180 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site