Skip to content

Commit

Permalink
cleanup powerpc/include/asm/ide.h
Browse files Browse the repository at this point in the history
This patch removes code that became unused through IDE changes and the 
arch/ppc/ removal.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  • Loading branch information
Adrian Bunk authored and Bartlomiej Zolnierkiewicz committed Aug 18, 2008
1 parent a69999e commit 1f49060
Showing 1 changed file with 1 addition and 42 deletions.
43 changes: 1 addition & 42 deletions arch/powerpc/include/asm/ide.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,53 +6,12 @@
#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))
#define __ide_mm_insl(p, a, c) readsl((void __iomem *)(p), (a), (c))
#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 */

0 comments on commit 1f49060

Please sign in to comment.