[PATCH] IDE 100

  Trivia time:

  - C99 conforming initializations by Rusty.

  - ide__sti() -> local_irq_enable() and its friends.

17 files changed, 2 insertions, 92 deletions

diff --git a/include/asm-alpha/ide.h b/include/asm-alpha/ide.h
index 5ec5fe1da2c1..63bb9f785498 100644
--- a/include/asm-alpha/ide.h
+++ b/include/asm-alpha/ide.h
@@ -19,8 +19,6 @@
 #define MAX_HWIFS	4
 #endif
 
-#define ide__sti()	__sti()
-
 static __inline__ int ide_default_irq(ide_ioreg_t base)
 {
 	switch (base) {
diff --git a/include/asm-arm/ide.h b/include/asm-arm/ide.h
index f1cbbe4876ea..741b223b06f0 100644
--- a/include/asm-arm/ide.h
+++ b/include/asm-arm/ide.h
@@ -17,8 +17,6 @@
 #define MAX_HWIFS	4
 #endif
 
-#define ide__sti()	__sti()
-
 #include <asm/arch/ide.h>
 
 /*
diff --git a/include/asm-cris/ide.h b/include/asm-cris/ide.h
index 051e96142e10..8f4bd8c131f4 100644
--- a/include/asm-cris/ide.h
+++ b/include/asm-cris/ide.h
@@ -22,8 +22,6 @@
 
 #define MAX_HWIFS	4
 
-#define ide__sti()	__sti()
-
 static __inline__ int ide_default_irq(ide_ioreg_t base)
 {
 	/* all IDE busses share the same IRQ, number 4.
diff --git a/include/asm-i386/ide.h b/include/asm-i386/ide.h
index 9bec7f280cde..b2ad635bdf94 100644
--- a/include/asm-i386/ide.h
+++ b/include/asm-i386/ide.h
@@ -23,8 +23,6 @@
 # endif
 #endif
 
-#define ide__sti()	__sti()
-
 static __inline__ int ide_default_irq(ide_ioreg_t base)
 {
 	switch (base) {
diff --git a/include/asm-ia64/ide.h b/include/asm-ia64/ide.h
index 50370ff4de3d..3c9fe4910181 100644
--- a/include/asm-ia64/ide.h
+++ b/include/asm-ia64/ide.h
@@ -25,8 +25,6 @@
 # endif
 #endif
 
-#define ide__sti()	__sti()
-
 static __inline__ int
 ide_default_irq (ide_ioreg_t base)
 {
diff --git a/include/asm-m68k/ide.h b/include/asm-m68k/ide.h
index 28c7e66668ea..1471687982a9 100644
--- a/include/asm-m68k/ide.h
+++ b/include/asm-m68k/ide.h
@@ -171,36 +171,5 @@ static __inline__ void ide_get_lock (int *ide_lock, void (*handler)(int, void *,
 	}
 }
 #endif /* CONFIG_ATARI */
-
-/*
- * On the Atari, we sometimes can't enable interrupts:
- */
-
-/* MSch: changed sti() to STI() wherever possible in ide.c; moved STI() def. 
- * to asm/ide.h 
- */
-/* The Atari interrupt structure strictly requires that the IPL isn't lowered
- * uncontrolled in an interrupt handler. In the concrete case, the IDE
- * interrupt is already a slow int, so the irq is already disabled at the time
- * the handler is called, and the IPL has been lowered to the minimum value
- * possible. To avoid going below that, STI() checks for being called inside
- * an interrupt, and in that case it does nothing. Hope that is reasonable and
- * works. (Roman)
- */
-#ifdef MACH_ATARI_ONLY
-#define	ide__sti()					\
-    do {						\
-	if (!in_interrupt()) __sti();			\
-    } while(0)
-#elif defined(CONFIG_ATARI)
-#define	ide__sti()						\
-    do {							\
-	if (!MACH_IS_ATARI || !in_interrupt()) sti();		\
-    } while(0)
-#else /* !defined(CONFIG_ATARI) */
-#define	ide__sti()	__sti()
-#endif
-
 #endif /* __KERNEL__ */
-
 #endif /* _M68K_IDE_H */
diff --git a/include/asm-mips/ide.h b/include/asm-mips/ide.h
index 85447877a181..33cd055aea35 100644
--- a/include/asm-mips/ide.h
+++ b/include/asm-mips/ide.h
@@ -24,8 +24,6 @@
 # endif
 #endif
 
-#define ide__sti()	__sti()
-
 struct ide_ops {
 	int (*ide_default_irq)(ide_ioreg_t base);
 	ide_ioreg_t (*ide_default_io_base)(int index);
diff --git a/include/asm-mips64/ide.h b/include/asm-mips64/ide.h
index ce6635f97a0c..de357ad5070e 100644
--- a/include/asm-mips64/ide.h
+++ b/include/asm-mips64/ide.h
@@ -27,8 +27,6 @@
 # endif
 #endif
 
-#define ide__sti()	__sti()
-
 struct ide_ops {
 	int (*ide_default_irq)(ide_ioreg_t base);
 	ide_ioreg_t (*ide_default_io_base)(int index);
diff --git a/include/asm-parisc/ide.h b/include/asm-parisc/ide.h
index 133997006872..be46fbf6af79 100644
--- a/include/asm-parisc/ide.h
+++ b/include/asm-parisc/ide.h
@@ -19,8 +19,6 @@
 #define MAX_HWIFS	10
 #endif
 
-#define ide__sti()	__sti()
-
 static __inline__ int ide_default_irq(ide_ioreg_t base)
 {
 	switch (base) {
diff --git a/include/asm-ppc/ide.h b/include/asm-ppc/ide.h
index 48dafbc1655b..db9bd31d08c5 100644
--- a/include/asm-ppc/ide.h
+++ b/include/asm-ppc/ide.h
@@ -44,8 +44,6 @@ extern struct ide_machdep_calls ppc_ide_md;
 #undef	SUPPORT_SLOW_DATA_PORTS
 #define	SUPPORT_SLOW_DATA_PORTS	0
 
-#define ide__sti()	__sti()
-
 static __inline__ int ide_default_irq(ide_ioreg_t base)
 {
 	if (ppc_ide_md.default_irq)
diff --git a/include/asm-ppc64/ide.h b/include/asm-ppc64/ide.h
index 4752dee41b2f..717dd566c7e7 100644
--- a/include/asm-ppc64/ide.h
+++ b/include/asm-ppc64/ide.h
@@ -7,7 +7,7 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version
  * 2 of the License, or (at your option) any later version.
- */ 
+ */
 
 /*
  *  This file contains the ppc64 architecture specific IDE code.
@@ -19,11 +19,9 @@
 #ifdef __KERNEL__
 
 #ifndef MAX_HWIFS
-#define MAX_HWIFS	4
+# define MAX_HWIFS	4
 #endif
 
-#define ide__sti()	__sti()
-
 static __inline__ int ide_default_irq(ide_ioreg_t base) { return 0; }
 static __inline__ ide_ioreg_t ide_default_io_base(int index) { return 0; }
 
diff --git a/include/asm-s390/ide.h b/include/asm-s390/ide.h
index b5ca760a3097..01d7765f7ef4 100644
--- a/include/asm-s390/ide.h
+++ b/include/asm-s390/ide.h
@@ -15,8 +15,6 @@
 #define MAX_HWIFS	0
 #endif
 
-#define ide__sti()	do {} while (0)
-
 /*
  * We always use the new IDE port registering,
  * so these are fixed here.
diff --git a/include/asm-s390x/ide.h b/include/asm-s390x/ide.h
deleted file mode 100644
index b5ca760a3097..000000000000
--- a/include/asm-s390x/ide.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  linux/include/asm-s390/ide.h
- *
- *  Copyright (C) 1994-1996  Linus Torvalds & authors
- */
-
-/* s390 does not have IDE */
-
-#ifndef __ASMS390_IDE_H
-#define __ASMS390_IDE_H
-
-#ifdef __KERNEL__
-
-#ifndef MAX_HWIFS
-#define MAX_HWIFS	0
-#endif
-
-#define ide__sti()	do {} while (0)
-
-/*
- * We always use the new IDE port registering,
- * so these are fixed here.
- */
-#define ide_default_io_base(i)		((ide_ioreg_t)0)
-#define ide_default_irq(b)		(0)
-
-#endif /* __KERNEL__ */
-
-#endif /* __ASMS390_IDE_H */
diff --git a/include/asm-sh/ide.h b/include/asm-sh/ide.h
index 9a2ddc373224..eb551e50d57f 100644
--- a/include/asm-sh/ide.h
+++ b/include/asm-sh/ide.h
@@ -22,8 +22,6 @@
 #define MAX_HWIFS	2
 #endif
 
-#define ide__sti()	__sti()
-
 static __inline__ int ide_default_irq_hp600(ide_ioreg_t base)
 {
 	switch (base) {
diff --git a/include/asm-sparc/ide.h b/include/asm-sparc/ide.h
index 7ac2eda1d0e7..07bb6650f34c 100644
--- a/include/asm-sparc/ide.h
+++ b/include/asm-sparc/ide.h
@@ -20,8 +20,6 @@
 #undef  MAX_HWIFS
 #define MAX_HWIFS	2
 
-#define	ide__sti()	__sti()
-
 static __inline__ int ide_default_irq(ide_ioreg_t base)
 {
 	return 0;
diff --git a/include/asm-sparc64/ide.h b/include/asm-sparc64/ide.h
index de65170ba834..d5672caf1628 100644
--- a/include/asm-sparc64/ide.h
+++ b/include/asm-sparc64/ide.h
@@ -20,8 +20,6 @@
 #undef  MAX_HWIFS
 #define MAX_HWIFS	2
 
-#define	ide__sti()	__sti()
-
 static __inline__ int ide_default_irq(ide_ioreg_t base)
 {
 	return 0;
diff --git a/include/asm-x86_64/ide.h b/include/asm-x86_64/ide.h
index 9bec7f280cde..b2ad635bdf94 100644
--- a/include/asm-x86_64/ide.h
+++ b/include/asm-x86_64/ide.h
@@ -23,8 +23,6 @@
 # endif
 #endif
 
-#define ide__sti()	__sti()
-
 static __inline__ int ide_default_irq(ide_ioreg_t base)
 {
 	switch (base) {