* [2.6 patch] cleanup powerpc/include/asm/ide.h
@ 2008-08-08 15:18 Adrian Bunk
2008-08-08 16:22 ` Bartlomiej Zolnierkiewicz
0 siblings, 1 reply; 2+ messages in thread
From: Adrian Bunk @ 2008-08-08 15:18 UTC (permalink / raw)
To: bzolnier; +Cc: linux-ide, linuxppc-dev
This patch removes code that became unused through IDE changes and the
arch/ppc/ removal.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
---
arch/powerpc/include/asm/ide.h | 43 ---------------------------------
1 file changed, 1 insertion(+), 42 deletions(-)
363979e32b08c578431a1773e7b885698feb30aa
diff --git a/arch/powerpc/include/asm/ide.h b/arch/powerpc/include/asm/ide.h
index 048480e..da01b20 100644
--- a/arch/powerpc/include/asm/ide.h
+++ b/arch/powerpc/include/asm/ide.h
@@ -6,12 +6,7 @@
#ifndef _ASM_POWERPC_IDE_H
#define _ASM_POWERPC_IDE_H
-#ifdef __KERNEL__
-
-#ifndef __powerpc64__
-#include <linux/sched.h>
-#include <asm/mpc8xx.h>
-#endif
+#include <linux/compiler.h>
#include <asm/io.h>
#define __ide_mm_insw(p, a, c) readsw((void __iomem *)(p), (a), (c))
@@ -19,40 +14,4 @@
#define __ide_mm_outsw(p, a, c) writesw((void __iomem *)(p), (a), (c))
#define __ide_mm_outsl(p, a, c) writesl((void __iomem *)(p), (a), (c))
-#ifndef __powerpc64__
-#include <linux/ioport.h>
-
-/* FIXME: use ide_platform host driver */
-static __inline__ int ide_default_irq(unsigned long base)
-{
-#ifdef CONFIG_PPLUS
- switch (base) {
- case 0x1f0: return 14;
- case 0x170: return 15;
- }
-#endif
- return 0;
-}
-
-/* FIXME: use ide_platform host driver */
-static __inline__ unsigned long ide_default_io_base(int index)
-{
-#ifdef CONFIG_PPLUS
- switch (index) {
- case 0: return 0x1f0;
- case 1: return 0x170;
- }
-#endif
- return 0;
-}
-
-#ifdef CONFIG_BLK_DEV_MPC8xx_IDE
-#define IDE_ARCH_ACK_INTR 1
-#define ide_ack_intr(hwif) ((hwif)->ack_intr ? (hwif)->ack_intr(hwif) : 1)
-#endif
-
-#endif /* __powerpc64__ */
-
-#endif /* __KERNEL__ */
-
#endif /* _ASM_POWERPC_IDE_H */
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [2.6 patch] cleanup powerpc/include/asm/ide.h
2008-08-08 15:18 [2.6 patch] cleanup powerpc/include/asm/ide.h Adrian Bunk
@ 2008-08-08 16:22 ` Bartlomiej Zolnierkiewicz
0 siblings, 0 replies; 2+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2008-08-08 16:22 UTC (permalink / raw)
To: Adrian Bunk; +Cc: linux-ide, linuxppc-dev
On Friday 08 August 2008, Adrian Bunk wrote:
> This patch removes code that became unused through IDE changes and the
> arch/ppc/ removal.
>
> Signed-off-by: Adrian Bunk <bunk@kernel.org>
applied
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-08-08 16:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-08 15:18 [2.6 patch] cleanup powerpc/include/asm/ide.h Adrian Bunk
2008-08-08 16:22 ` 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).