[PATCH] asm/ide.h: ide_ioreg_t cleanup

ide_ioreg_t is deprecated and hasn't been used by IDE driver for some time.
Use unsigned long directly on alpha, arm26, arm, mips, parisc, ppc64 and sh.

asm-ia64/ide.h (ide_ioreg_t is unsigned short) and asm-m68knommu/ide.h
(broken - ide_ioreg_t is not defined) are the only users of ide_ioreg_t left.

diff --git a/include/asm-alpha/ide.h b/include/asm-alpha/ide.h
index 603d85ab15d96fb4b200595aaf2116e7d7ea520a..d2939631090249f0bb59fa7d3c1ad505661a1de3 100644 (file)
--- a/include/asm-alpha/ide.h
+++ b/include/asm-alpha/ide.h
@@ -19,7 +19,7 @@
 #define MAX_HWIFS      CONFIG_IDE_MAX_HWIFS
 #endif
 
-static __inline__ int ide_default_irq(ide_ioreg_t base)
+static inline int ide_default_irq(unsigned long base)
 {
        switch (base) {
                case 0x1f0: return 14;
@@ -31,7 +31,7 @@ static __inline__ int ide_default_irq(ide_ioreg_t base)
        }
 }
 
-static __inline__ ide_ioreg_t ide_default_io_base(int index)
+static inline unsigned long ide_default_io_base(int index)
 {
        switch (index) {
                case 0: return 0x1f0;
@@ -43,9 +43,10 @@ static __inline__ ide_ioreg_t ide_default_io_base(int index)
        }
 }
 
-static __inline__ void ide_init_hwif_ports(hw_regs_t *hw, ide_ioreg_t data_port, ide_ioreg_t ctrl_port, int *irq)
+static inline void ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port,
+                                      unsigned long ctrl_port, int *irq)
 {
-       ide_ioreg_t reg = data_port;
+       unsigned long reg = data_port;
        int i;
 
        for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {

diff --git a/include/asm-arm/arch-cl7500/ide.h b/include/asm-arm/arch-cl7500/ide.h
index 3e07849dd90b9961de5f1344c9ddcca72580748d..78f97a3b292d089e5446db1d8e4ae31307dc5dbc 100644 (file)
--- a/include/asm-arm/arch-cl7500/ide.h
+++ b/include/asm-arm/arch-cl7500/ide.h
@@ -13,10 +13,10 @@
  * Set up a hw structure for a specified data port, control port and IRQ.
  * This should follow whatever the default interface uses.
  */
-static __inline__ void
-ide_init_hwif_ports(hw_regs_t *hw, int data_port, int ctrl_port, int *irq)
+static inline void ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port,
+                                      unsigned long ctrl_port, int *irq)
 {
-       ide_ioreg_t reg = data_port;
+       unsigned long reg = data_port;
        int i;
 
        memset(hw, 0, sizeof(*hw));

diff --git a/include/asm-arm/arch-ebsa285/ide.h b/include/asm-arm/arch-ebsa285/ide.h
index e6110d2cb40d88cfd83f20d5fe18d984da46cba9..09c0310b60851821c2d095c079f1ff9bdfa38385 100644 (file)
--- a/include/asm-arm/arch-ebsa285/ide.h
+++ b/include/asm-arm/arch-ebsa285/ide.h
@@ -16,17 +16,17 @@
  * Set up a hw structure for a specified data port, control port and IRQ.
  * This should follow whatever the default interface uses.
  */
-static __inline__ void
-ide_init_hwif_ports(hw_regs_t *hw, int data_port, int ctrl_port, int *irq)
+static inline void ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port,
+                                      unsigned long ctrl_port, int *irq)
 {
-       ide_ioreg_t reg = (ide_ioreg_t) data_port;
+       unsigned long reg = data_port;
        int i;
 
        for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
                hw->io_ports[i] = reg;
                reg += 1;
        }
-       hw->io_ports[IDE_CONTROL_OFFSET] = (ide_ioreg_t) ctrl_port;
+       hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port;
        if (irq)
                *irq = 0;
 }

diff --git a/include/asm-arm/arch-iop3xx/ide.h b/include/asm-arm/arch-iop3xx/ide.h
index 6f3aab898bfab7c01b85bf76df1da01ee2f4e4e2..c2b0265ddfae1b61b42536cedddae6e2a1112a81 100644 (file)
--- a/include/asm-arm/arch-iop3xx/ide.h
+++ b/include/asm-arm/arch-iop3xx/ide.h
@@ -18,23 +18,21 @@
  * Set up a hw structure for a specified data port, control port and IRQ.
  * This should follow whatever the default interface uses.
  */
-static __inline__ void
-ide_init_hwif_ports(hw_regs_t *hw, int data_port, int ctrl_port, int *irq)
+static inline void ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port,
+                                      unsigned long ctrl_port, int *irq)
 {
-       ide_ioreg_t reg;
+       unsigned long reg = data_port;
        int i;
        int regincr = 1;
 
        memset(hw, 0, sizeof(*hw));
 
-       reg = (ide_ioreg_t)data_port;
-
        for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
                hw->io_ports[i] = reg;
                reg += regincr;
        }
 
-       hw->io_ports[IDE_CONTROL_OFFSET] = (ide_ioreg_t) ctrl_port;
+       hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port;
 
        if (irq) *irq = 0;
 }

diff --git a/include/asm-arm/arch-l7200/ide.h b/include/asm-arm/arch-l7200/ide.h
index 61cec831ae285bb788bf4c46bbc75dbe0cca3c1b..62ee12ada061173b03d133b4f26d824c673cdeb6 100644 (file)
--- a/include/asm-arm/arch-l7200/ide.h
+++ b/include/asm-arm/arch-l7200/ide.h
@@ -12,8 +12,8 @@
  * Set up a hw structure for a specified data port, control port and IRQ.
  * This should follow whatever the default interface uses.
  */
-static __inline__ void
-ide_init_hwif_ports(hw_regs_t *hw, int data_port, int ctrl_port, int *irq)
+static inline void ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port,
+                                      unsigned long ctrl_port, int *irq)
 {
 }
 

diff --git a/include/asm-arm/arch-nexuspci/ide.h b/include/asm-arm/arch-nexuspci/ide.h
index 4a4d1b20cae2a913fe6e81d84a5f082618f42832..5514808d568aaa03d7baa223e5efcdefd7a9c755 100644 (file)
--- a/include/asm-arm/arch-nexuspci/ide.h
+++ b/include/asm-arm/arch-nexuspci/ide.h
@@ -12,17 +12,17 @@
  * Set up a hw structure for a specified data port, control port and IRQ.
  * This should follow whatever the default interface uses.
  */
-static __inline__ void
-ide_init_hwif_ports(hw_regs_t *hw, int data_port, int ctrl_port, int *irq)
+static inline void ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port,
+                                      unsigned long ctrl_port, int *irq)
 {
-       ide_ioreg_t reg = (ide_ioreg_t) data_port;
+       unsigned long reg = data_port;
        int i;
 
        for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
                hw->io_ports[i] = reg;
                reg += 1;
        }
-       hw->io_ports[IDE_CONTROL_OFFSET] = (ide_ioreg_t) ctrl_port;
+       hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port;
        if (irq)
                *irq = 0;
 }

diff --git a/include/asm-arm/arch-pxa/ide.h b/include/asm-arm/arch-pxa/ide.h
index 71a2e11b0206137794e236364b09d4a1edddeea7..a9efdce2bf965147679a6648e179684b62023d6d 100644 (file)
--- a/include/asm-arm/arch-pxa/ide.h
+++ b/include/asm-arm/arch-pxa/ide.h
@@ -23,23 +23,21 @@
  * Set up a hw structure for a specified data port, control port and IRQ.
  * This should follow whatever the default interface uses.
  */
-static __inline__ void
-ide_init_hwif_ports(hw_regs_t *hw, int data_port, int ctrl_port, int *irq)
+static inline void ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port,
+                                      unsigned long ctrl_port, int *irq)
 {
-       ide_ioreg_t reg;
+       unsigned long reg = data_port;
        int i;
        int regincr = 1;
 
        memset(hw, 0, sizeof(*hw));
 
-       reg = (ide_ioreg_t)data_port;
-
        for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
                hw->io_ports[i] = reg;
                reg += regincr;
        }
 
-       hw->io_ports[IDE_CONTROL_OFFSET] = (ide_ioreg_t) ctrl_port;
+       hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port;
 
        if (irq)
                *irq = 0;

diff --git a/include/asm-arm/arch-rpc/ide.h b/include/asm-arm/arch-rpc/ide.h
index 15fecab1f7b89de0c3ceae93bd3ad9741f9098af..92c7030ab4f12fcad5b31f13456f1fb476cc0579 100644 (file)
--- a/include/asm-arm/arch-rpc/ide.h
+++ b/include/asm-arm/arch-rpc/ide.h
@@ -16,10 +16,10 @@
  * Set up a hw structure for a specified data port, control port and IRQ.
  * This should follow whatever the default interface uses.
  */
-static __inline__ void
-ide_init_hwif_ports(hw_regs_t *hw, int data_port, int ctrl_port, int *irq)
+static inline void ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port,
+                                      unsigned long ctrl_port, int *irq)
 {
-       ide_ioreg_t reg = (ide_ioreg_t) data_port;
+       unsigned long reg = data_port;
        int i;
 
        memset(hw, 0, sizeof(*hw));
@@ -28,7 +28,7 @@ ide_init_hwif_ports(hw_regs_t *hw, int data_port, int ctrl_port, int *irq)
                hw->io_ports[i] = reg;
                reg += 1;
        }
-       hw->io_ports[IDE_CONTROL_OFFSET] = (ide_ioreg_t) ctrl_port;
+       hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port;
        if (irq)
                *irq = 0;
 }

diff --git a/include/asm-arm/arch-s3c2410/ide.h b/include/asm-arm/arch-s3c2410/ide.h
index a13d00b6e4fe038ab4d2cd38ee0aa413cb9fd7b1..de651e75d240fd9e5ba2be9967f11f8e235201f4 100644 (file)
--- a/include/asm-arm/arch-s3c2410/ide.h
+++ b/include/asm-arm/arch-s3c2410/ide.h
@@ -23,10 +23,10 @@
  * This should follow whatever the default interface uses.
  */
 
-static __inline__ void
-ide_init_hwif_ports(hw_regs_t *hw, int data_port, int ctrl_port, int *irq)
+static inline void ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port,
+                                      unsigned long ctrl_port, int *irq)
 {
-       ide_ioreg_t reg = (ide_ioreg_t) data_port;
+       unsigned long reg = data_port;
        int i;
 
        memset(hw, 0, sizeof(*hw));
@@ -35,7 +35,7 @@ ide_init_hwif_ports(hw_regs_t *hw, int data_port, int ctrl_port, int *irq)
                hw->io_ports[i] = reg;
                reg += 1;
        }
-       hw->io_ports[IDE_CONTROL_OFFSET] = (ide_ioreg_t) ctrl_port;
+       hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port;
        if (irq)
                *irq = 0;
 }

diff --git a/include/asm-arm/arch-sa1100/ide.h b/include/asm-arm/arch-sa1100/ide.h
index 9c8e1c7644aa049a53410e20771340e19cf998b1..bc4429642befd0a7bb5cec199517b426e76371aa 100644 (file)
--- a/include/asm-arm/arch-sa1100/ide.h
+++ b/include/asm-arm/arch-sa1100/ide.h
@@ -19,13 +19,13 @@
  * Set up a hw structure for a specified data port, control port and IRQ.
  * This should follow whatever the default interface uses.
  */
-static __inline__ void
-ide_init_hwif_ports(hw_regs_t *hw, int data_port, int ctrl_port, int *irq)
+static inline void ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port,
+                                      unsigned long ctrl_port, int *irq)
 {
-       ide_ioreg_t reg;
+       unsigned long reg = data_port;
        int i;
        int regincr = 1;
-       
+
        /* The Empeg board has the first two address lines unused */
        if (machine_is_empeg())
                regincr = 1 << 2;
@@ -36,15 +36,13 @@ ide_init_hwif_ports(hw_regs_t *hw, int data_port, int ctrl_port, int *irq)
 
        memset(hw, 0, sizeof(*hw));
 
-       reg = (ide_ioreg_t)data_port;
-
        for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
                hw->io_ports[i] = reg;
                reg += regincr;
        }
-       
-       hw->io_ports[IDE_CONTROL_OFFSET] = (ide_ioreg_t) ctrl_port;
-       
+
+       hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port;
+
        if (irq)
                *irq = 0;
 }

diff --git a/include/asm-arm/arch-shark/ide.h b/include/asm-arm/arch-shark/ide.h
index c3b2a1198e5756e68f53f8be4bfb621c5107af52..f6a99b22fabb7c3b7ed0329d7bca8000d8cb8e46 100644 (file)
--- a/include/asm-arm/arch-shark/ide.h
+++ b/include/asm-arm/arch-shark/ide.h
@@ -14,10 +14,10 @@
  * Set up a hw structure for a specified data port, control port and IRQ.
  * This should follow whatever the default interface uses.
  */
-static __inline__ void
-ide_init_hwif_ports(hw_regs_t *hw, int data_port, int ctrl_port, int *irq)
+static inline void ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port,
+                                      unsigned long ctrl_port, int *irq)
 {
-       ide_ioreg_t reg = (ide_ioreg_t) data_port;
+       unsigned long reg = data_port;
        int i;
 
        memset(hw, 0, sizeof(*hw));
@@ -26,7 +26,7 @@ ide_init_hwif_ports(hw_regs_t *hw, int data_port, int ctrl_port, int *irq)
                hw->io_ports[i] = reg;
                reg += 1;
        }
-       hw->io_ports[IDE_CONTROL_OFFSET] = (ide_ioreg_t) ctrl_port;
+       hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port;
        if (irq)
                *irq = 0;
 }

diff --git a/include/asm-arm/ide.h b/include/asm-arm/ide.h
index a47842c4a8ac754a67385c2475c90c5e1dd13a25..08edb8fed69abb70e65db3aba9c9dabcb0211857 100644 (file)
--- a/include/asm-arm/ide.h
+++ b/include/asm-arm/ide.h
@@ -23,7 +23,7 @@
  * 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_io_base(i)         (0)
 #define ide_default_irq(b)             (0)
 
 #define __ide_mm_insw(port,addr,len)   readsw(port,addr,len)

diff --git a/include/asm-arm26/ide.h b/include/asm-arm26/ide.h
index 6155a194282ead29e241a9b33b152e2511a4e444..0cabfb135049c9c6105ec13f837573a072752213 100644 (file)
--- a/include/asm-arm26/ide.h
+++ b/include/asm-arm26/ide.h
@@ -30,17 +30,17 @@
  * Set up a hw structure for a specified data port, control port and IRQ.
  * This should follow whatever the default interface uses.
  */
-static __inline__ void
-ide_init_hwif_ports(hw_regs_t *hw, int data_port, int ctrl_port, int *irq)
+static inline void ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port,
+                                      unsigned long ctrl_port, int *irq)
 {
-        ide_ioreg_t reg = (ide_ioreg_t) data_port;
+       unsigned long reg = data_port;
         int i;
 
         for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
                 hw->io_ports[i] = reg;
                 reg += 1;
         }
-        hw->io_ports[IDE_CONTROL_OFFSET] = (ide_ioreg_t) ctrl_port;
+       hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port;
         if (irq)
                 *irq = 0;
 }
@@ -67,7 +67,7 @@ static __inline__ void ide_init_default_hwifs(void)
  * 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_io_base(i)         (0)
 #define ide_default_irq(b)             (0)
 
 #endif /* __KERNEL__ */

diff --git a/include/asm-mips/mach-generic/ide.h b/include/asm-mips/mach-generic/ide.h
index 95a50fe448c2cfeb341861bcf6c3a3e68ab029e9..ce523a260ec3f0ec430a407026f0baa0186eeaf6 100644 (file)
--- a/include/asm-mips/mach-generic/ide.h
+++ b/include/asm-mips/mach-generic/ide.h
@@ -34,7 +34,7 @@ static inline int ide_default_irq(unsigned long base)
        }
 }
 
-static inline ide_ioreg_t ide_default_io_base(int index)
+static inline unsigned long ide_default_io_base(int index)
 {
        switch (index) {
                case 0: return 0x1f0;

diff --git a/include/asm-parisc/ide.h b/include/asm-parisc/ide.h
index 230bc4402630737cab3d57ac9da60129177901cb..ebcff9a6026bcf43898e5d7b3fccd1c8adb9891b 100644 (file)
--- a/include/asm-parisc/ide.h
+++ b/include/asm-parisc/ide.h
@@ -20,11 +20,12 @@
 #endif
 
 #define ide_default_irq(base) (0)
-#define ide_default_io_base(index) ((ide_ioreg_t)0)
+#define ide_default_io_base(index) (0)
 
-static __inline__ void ide_init_hwif_ports(hw_regs_t *hw, ide_ioreg_t data_port, ide_ioreg_t ctrl_port, int *irq)
+static inline void ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port,
+                                      unsigned long ctrl_port, int *irq)
 {
-       ide_ioreg_t reg = data_port;
+       unsigned long reg = data_port;
        int i;
 
        for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {

diff --git a/include/asm-ppc64/ide.h b/include/asm-ppc64/ide.h
index 717dd566c7e724e8cf0ad47ace751e1d4e1f9cf4..0c2a626f2b05b464e0d751a6983ca3b94e34879d 100644 (file)
--- a/include/asm-ppc64/ide.h
+++ b/include/asm-ppc64/ide.h
@@ -22,12 +22,13 @@
 # define MAX_HWIFS     4
 #endif
 
-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; }
+static inline int ide_default_irq(unsigned long base) { return 0; }
+static inline unsigned long ide_default_io_base(int index) { return 0; }
 
-static __inline__ void ide_init_hwif_ports(hw_regs_t *hw, ide_ioreg_t data_port, ide_ioreg_t ctrl_port, int *irq)
+static inline void ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port,
+                                      unsigned long ctrl_port, int *irq)
 {
-       ide_ioreg_t reg = data_port;
+       unsigned long reg = data_port;
        int i;
 
        for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {

diff --git a/include/asm-sh/ide.h b/include/asm-sh/ide.h
index 0c59c443220f74fea1582c83873cf88a61c022df..f5b1346d5a69379cb32b0d545d8f8f8a9d495d2a 100644 (file)
--- a/include/asm-sh/ide.h
+++ b/include/asm-sh/ide.h
@@ -22,7 +22,7 @@
 #define MAX_HWIFS      2
 #endif
 
-static __inline__ int ide_default_irq_hp600(ide_ioreg_t base)
+static inline int ide_default_irq_hp600(unsigned long base)
 {
        switch (base) {
                case 0x01f0: return 93;
@@ -32,7 +32,7 @@ static __inline__ int ide_default_irq_hp600(ide_ioreg_t base)
        }
 }
 
-static __inline__ int ide_default_irq(ide_ioreg_t base)
+static inline int ide_default_irq(unsigned long base)
 {
        if (MACH_HP600) {
                return ide_default_irq_hp600(base);
@@ -45,7 +45,7 @@ static __inline__ int ide_default_irq(ide_ioreg_t base)
        }
 }
 
-static __inline__ ide_ioreg_t ide_default_io_base_hp600(int index)
+static inline unsigned long ide_default_io_base_hp600(int index)
 {
        switch (index) {
                case 0: 
@@ -57,7 +57,7 @@ static __inline__ ide_ioreg_t ide_default_io_base_hp600(int index)
        }
 }
 
-static __inline__ ide_ioreg_t ide_default_io_base(int index)
+static inline unsigned long ide_default_io_base(int index)
 {
        if (MACH_HP600) {
                return ide_default_io_base_hp600(index);
@@ -72,9 +72,10 @@ static __inline__ ide_ioreg_t ide_default_io_base(int index)
        }
 }
 
-static __inline__ void ide_init_hwif_ports(hw_regs_t *hw, ide_ioreg_t data_port, ide_ioreg_t ctrl_port, int *irq)
+static inline void ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port,
+                                      unsigned long ctrl_port, int *irq)
 {
-       ide_ioreg_t reg = data_port;
+       unsigned long reg = data_port;
        int i;
 
        for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {