Home » Mailing list archives » linux-kernel » 2008 » February » 16

[PATCH 01/12] ide: remove ide_default_io_ctl() macro

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Bartlomiej Zolnierkiewicz <bzolnier@...>
To: <linux-ide@...>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@...>, <linux-kernel@...>
Subject: [PATCH 01/12] ide: remove ide_default_io_ctl() macro
Date: Saturday, February 16, 2008 - 12:38 pm

It is always == '((base) + 0x206)' if CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS=y
and it is not needed otherwise (arm, blackfin, parisc, ppc64, sh, sparc[64]).

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
 drivers/ide/ide.c                   |    2 +-
 include/asm-alpha/ide.h             |    2 --
 include/asm-arm/ide.h               |    8 --------
 include/asm-blackfin/ide.h          |    4 ----
 include/asm-ia64/ide.h              |    2 --
 include/asm-m32r/ide.h              |    2 --
 include/asm-mips/mach-generic/ide.h |    2 --
 include/asm-parisc/ide.h            |    2 --
 include/asm-powerpc/ide.h           |    2 --
 include/asm-sh/ide.h                |    3 ---
 include/asm-sparc/ide.h             |    2 --
 include/asm-sparc64/ide.h           |    2 --
 include/asm-x86/ide.h               |    2 --
 13 files changed, 1 insertion(+), 34 deletions(-)

Index: b/drivers/ide/ide.c
===================================================================
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -205,7 +205,7 @@ static void __init init_ide_data (void)
 	for (index = 0; index < MAX_HWIFS; ++index) {
 		ide_hwif_t *hwif = &ide_hwifs[index];
 		unsigned long io_addr = ide_default_io_base(index);
-		unsigned long ctl_addr = ide_default_io_ctl(io_addr);
+		unsigned long ctl_addr = io_addr + 0x206;
 
 		ide_init_port_data(hwif, index);
 
Index: b/include/asm-alpha/ide.h
===================================================================
--- a/include/asm-alpha/ide.h
+++ b/include/asm-alpha/ide.h
@@ -37,8 +37,6 @@ static inline unsigned long ide_default_
 	}
 }
 
-#define ide_default_io_ctl(base)	((base) + 0x206) /* obsolete */
-
 #ifdef CONFIG_PCI
 #define ide_init_default_irq(base)	(0)
 #else
Index: b/include/asm-arm/ide.h
===================================================================
--- a/include/asm-arm/ide.h
+++ b/include/asm-arm/ide.h
@@ -17,14 +17,6 @@
 #define MAX_HWIFS	4
 #endif
 
-#if !defined(CONFIG_ARCH_L7200)
-# ifdef CONFIG_ARCH_CLPS7500
-#  define ide_default_io_ctl(base)	((base) + 0x206) /* obsolete */
-# else
-#  define ide_default_io_ctl(base)	(0)
-# endif
-#endif /* !ARCH_L7200 */
-
 #define __ide_mm_insw(port,addr,len)	readsw(port,addr,len)
 #define __ide_mm_insl(port,addr,len)	readsl(port,addr,len)
 #define __ide_mm_outsw(port,addr,len)	writesw(port,addr,len)
Index: b/include/asm-blackfin/ide.h
===================================================================
--- a/include/asm-blackfin/ide.h
+++ b/include/asm-blackfin/ide.h
@@ -19,10 +19,6 @@
 
 #define MAX_HWIFS	1
 
-/* Legacy ... BLK_DEV_IDECS */
-#define ide_default_io_ctl(base)	((base) + 0x206) /* obsolete */
-
-
 #include <asm-generic/ide_iops.h>
 
 /****************************************************************************/
Index: b/include/asm-ia64/ide.h
===================================================================
--- a/include/asm-ia64/ide.h
+++ b/include/asm-ia64/ide.h
@@ -44,8 +44,6 @@ static inline unsigned long ide_default_
 	}
 }
 
-#define ide_default_io_ctl(base)	((base) + 0x206) /* obsolete */
-
 #ifdef CONFIG_PCI
 #define ide_init_default_irq(base)	(0)
 #else
Index: b/include/asm-m32r/ide.h
===================================================================
--- a/include/asm-m32r/ide.h
+++ b/include/asm-m32r/ide.h
@@ -63,8 +63,6 @@ static __inline__ unsigned long ide_defa
 	}
 }
 
-#define ide_default_io_ctl(base)	((base) + 0x206) /* obsolete */
-
 #ifdef CONFIG_BLK_DEV_IDEPCI
 #define ide_init_default_irq(base)     (0)
 #else
Index: b/include/asm-mips/mach-generic/ide.h
===================================================================
--- a/include/asm-mips/mach-generic/ide.h
+++ b/include/asm-mips/mach-generic/ide.h
@@ -96,8 +96,6 @@ static __inline__ unsigned long ide_defa
 	}
 }
 
-#define ide_default_io_ctl(base)	((base) + 0x206) /* obsolete */
-
 #ifdef CONFIG_BLK_DEV_IDEPCI
 #define ide_init_default_irq(base)	(0)
 #else
Index: b/include/asm-parisc/ide.h
===================================================================
--- a/include/asm-parisc/ide.h
+++ b/include/asm-parisc/ide.h
@@ -17,8 +17,6 @@
 #define MAX_HWIFS	2
 #endif
 
-#define ide_default_io_ctl(base)	((base) + 0x206) /* obsolete */
-
 #define ide_request_irq(irq,hand,flg,dev,id)	request_irq((irq),(hand),(flg),(dev),(id))
 #define ide_free_irq(irq,dev_id)		free_irq((irq), (dev_id))
 #define ide_request_region(from,extent,name)	request_region((from), (extent), (name))
Index: b/include/asm-powerpc/ide.h
===================================================================
--- a/include/asm-powerpc/ide.h
+++ b/include/asm-powerpc/ide.h
@@ -86,8 +86,6 @@ static __inline__ unsigned long ide_defa
 
 #endif /* __powerpc64__ */
 
-#define ide_default_io_ctl(base)	((base) + 0x206) /* obsolete */
-
 #endif /* __KERNEL__ */
 
 #endif /* _ASM_POWERPC_IDE_H */
Index: b/include/asm-sh/ide.h
===================================================================
--- a/include/asm-sh/ide.h
+++ b/include/asm-sh/ide.h
@@ -14,9 +14,6 @@
 
 #ifdef __KERNEL__
 
-
-#define ide_default_io_ctl(base)	(0)
-
 #include <asm-generic/ide_iops.h>
 
 #endif /* __KERNEL__ */
Index: b/include/asm-sparc/ide.h
===================================================================
--- a/include/asm-sparc/ide.h
+++ b/include/asm-sparc/ide.h
@@ -17,8 +17,6 @@
 #undef  MAX_HWIFS
 #define MAX_HWIFS	2
 
-#define ide_default_io_ctl(base)	((base) + 0x206) /* obsolete */
-
 #define __ide_insl(data_reg, buffer, wcount) \
 	__ide_insw(data_reg, buffer, (wcount)<<1)
 #define __ide_outsl(data_reg, buffer, wcount) \
Index: b/include/asm-sparc64/ide.h
===================================================================
--- a/include/asm-sparc64/ide.h
+++ b/include/asm-sparc64/ide.h
@@ -24,8 +24,6 @@
 # endif
 #endif
 
-#define ide_default_io_ctl(base)	((base) + 0x206) /* obsolete */
-
 #define __ide_insl(data_reg, buffer, wcount) \
 	__ide_insw(data_reg, buffer, (wcount)<<1)
 #define __ide_outsl(data_reg, buffer, wcount) \
Index: b/include/asm-x86/ide.h
===================================================================
--- a/include/asm-x86/ide.h
+++ b/include/asm-x86/ide.h
@@ -58,8 +58,6 @@ static __inline__ unsigned long ide_defa
 	}
 }
 
-#define ide_default_io_ctl(base)	((base) + 0x206) /* obsolete */
-
 #ifdef CONFIG_BLK_DEV_IDEPCI
 #define ide_init_default_irq(base)	(0)
 #else
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 01/12] ide: remove ide_default_io_ctl() macro, Bartlomiej Zolnierkiewicz..., (Sat Feb 16, 12:38 pm)
[PATCH 12/12] ide: cleanup ide_find_port(), Bartlomiej Zolnierkiewicz..., (Sat Feb 16, 12:40 pm)
[PATCH 11/12] ide: cleanup ide_match_hwif(), Bartlomiej Zolnierkiewicz..., (Sat Feb 16, 12:40 pm)
[PATCH 10/12] ide: remove ide_init_default_irq() macro, Bartlomiej Zolnierkiewicz..., (Sat Feb 16, 12:40 pm)
[PATCH 09/12] ide: move default IDE ports setup to ide_gener..., Bartlomiej Zolnierkiewicz..., (Sat Feb 16, 12:39 pm)
[PATCH 08/12] ide: remove needless hwif-&gt;irq check from i..., Bartlomiej Zolnierkiewicz..., (Sat Feb 16, 12:39 pm)
[PATCH 07/12] ide: init hwif-&gt;{io_ports,irq} explicitly i..., Bartlomiej Zolnierkiewicz..., (Sat Feb 16, 12:39 pm)
[PATCH 06/12] ide: limit legacy VLB host drivers to alpha, x..., Bartlomiej Zolnierkiewicz..., (Sat Feb 16, 12:39 pm)
[PATCH 05/12] cmd640: init hwif-&gt;{io_ports,irq} explicitly, Bartlomiej Zolnierkiewicz..., (Sat Feb 16, 12:39 pm)
[PATCH 04/12] cmd640: cleanup setup_device_ptrs(), Bartlomiej Zolnierkiewicz..., (Sat Feb 16, 12:39 pm)
[PATCH 03/12] ide: add ide-4drives host driver, Bartlomiej Zolnierkiewicz..., (Sat Feb 16, 12:39 pm)
Re: [PATCH 03/12] ide: add ide-4drives host driver, Sergei Shtylyov, (Tue Feb 19, 9:03 am)
Re: [PATCH 03/12] ide: add ide-4drives host driver, Bartlomiej Zolnierkiewicz..., (Tue Feb 19, 5:24 pm)
Re: [PATCH 03/12] ide: add ide-4drives host driver, Randy Dunlap, (Sat Feb 16, 1:26 pm)
Re: [PATCH 03/12] ide: add ide-4drives host driver, Bartlomiej Zolnierkiewicz..., (Sun Feb 17, 1:12 pm)
[PATCH 02/12] ide: remove ppc ifdef from init_ide_data(), Bartlomiej Zolnierkiewicz..., (Sat Feb 16, 12:39 pm)