Commit 39dff54f authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Linus Torvalds

[PATCH] ide: ide-proc fix for m68k

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

The IDE sparse fixups cause 2 warnings (unused variables `val' and
`reg') on m68k and APUS.  However, the reason why this code was
commented out is gone.  So just remove the special case.
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8f969a52
...@@ -233,27 +233,6 @@ static int proc_ide_write_config(struct file *file, const char __user *buffer, ...@@ -233,27 +233,6 @@ static int proc_ide_write_config(struct file *file, const char __user *buffer,
} }
#endif /* CONFIG_BLK_DEV_IDEPCI */ #endif /* CONFIG_BLK_DEV_IDEPCI */
} else { /* not pci */ } 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) { switch (r->size) {
case 1: hwif->OUTB(val, reg); case 1: hwif->OUTB(val, reg);
break; break;
...@@ -262,7 +241,6 @@ static int proc_ide_write_config(struct file *file, const char __user *buffer, ...@@ -262,7 +241,6 @@ static int proc_ide_write_config(struct file *file, const char __user *buffer,
case 4: hwif->OUTL(val, reg); case 4: hwif->OUTL(val, reg);
break; break;
} }
#endif /* !__mc68000__ && !CONFIG_APUS */
} }
} }
spin_unlock_irqrestore(&ide_lock, flags); spin_unlock_irqrestore(&ide_lock, flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment