Commit d45b70ab authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

mn10300: remove <asm/ide.h> 



* Remove superfluous <asm/intctl-regs.h> include.

* Remove no longer used SUPPORT_SLOW_DATA_PORTS define.

* Move defining SUPPORT_VLB_SYNC to <linux/ide.h>.

* Use __ide_mm_*() macros from <asm-generic/ide_iops.h>
  (MN10300 uses only memory-mapped I/O).

* Remove <asm/ide.h>.

While at it:

* Remove superfluous SPARC64 #ifdef from <linux/ide.h>.

Cc: David Howells <dhowells@redhat.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 662641d9

include/asm-mn10300/ide.h

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
/* MN10300 Arch-specific IDE code

 *

 * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.

 * Written by David Howells (dhowells@redhat.com)

 * - Derived from include/asm-i386/ide.h

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public Licence

 * as published by the Free Software Foundation; either version

 * 2 of the Licence, or (at your option) any later version.

 */



#ifndef _ASM_IDE_H

#define _ASM_IDE_H



#ifdef __KERNEL__



#include <asm/intctl-regs.h>



#undef SUPPORT_SLOW_DATA_PORTS

#define SUPPORT_SLOW_DATA_PORTS 0



#undef SUPPORT_VLB_SYNC

#define SUPPORT_VLB_SYNC 0



/*

 * some bits needed for parts of the IDE subsystem to compile

 */

#define __ide_mm_insw(port, addr, n) \

	insw((unsigned long) (port), (addr), (n))

#define __ide_mm_insl(port, addr, n) \

	insl((unsigned long) (port), (addr), (n))

#define __ide_mm_outsw(port, addr, n) \

	outsw((unsigned long) (port), (addr), (n))

#define __ide_mm_outsl(port, addr, n) \

	outsl((unsigned long) (port), (addr), (n))



#endif /* __KERNEL__ */

#endif /* _ASM_IDE_H */

include/linux/ide.h

+2 −3
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <asm/io.h>

#include <asm/mutex.h>



#if defined(CONFIG_CRIS) || defined(CONFIG_FRV)

#if defined(CONFIG_CRIS) || defined(CONFIG_FRV) || defined(CONFIG_MN10300)

# define SUPPORT_VLB_SYNC 0

#else

# define SUPPORT_VLB_SYNC 1
@@ -194,8 +194,7 @@ static inline void ide_std_init_ports(hw_regs_t *hw, 
}



#if defined(CONFIG_ARM) || defined(CONFIG_M68K) || defined(CONFIG_MIPS) || \

    defined(CONFIG_MN10300) || defined(CONFIG_PARISC) \

    || defined(CONFIG_PPC) || defined(CONFIG_SPARC) || defined(CONFIG_SPARC64)

    defined(CONFIG_PARISC) || defined(CONFIG_PPC) || defined(CONFIG_SPARC)

#include <asm/ide.h>

#else

#include <asm-generic/ide_iops.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE