summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/ppc/platforms/k2_setup.c6
-rw-r--r--arch/ppc/platforms/lopec_setup.c16
-rw-r--r--arch/ppc/platforms/mcpn765_setup.c16
-rw-r--r--arch/ppc/platforms/menf1_setup.c10
-rw-r--r--arch/ppc/platforms/pplus_setup.c8
-rw-r--r--arch/ppc/platforms/prep_setup.c4
-rw-r--r--arch/ppc/platforms/sandpoint_setup.c16
-rw-r--r--arch/ppc/syslib/ppc4xx_setup.c4
-rw-r--r--include/asm-ppc/ide.h20
9 files changed, 50 insertions, 50 deletions
diff --git a/arch/ppc/platforms/k2_setup.c b/arch/ppc/platforms/k2_setup.c
index 8a7396a18da1..fb62f99422ab 100644
--- a/arch/ppc/platforms/k2_setup.c
+++ b/arch/ppc/platforms/k2_setup.c
@@ -56,10 +56,10 @@ static unsigned int cpu_6xx[16] = {
/* IDE functions */
static void __init
-k2_ide_init_hwif_ports (hw_regs_t *hw, ide_ioreg_t data_port,
- ide_ioreg_t ctrl_port, int *irq)
+k2_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 = 8;
for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
diff --git a/arch/ppc/platforms/lopec_setup.c b/arch/ppc/platforms/lopec_setup.c
index 029ef110d2c7..2e96b741af31 100644
--- a/arch/ppc/platforms/lopec_setup.c
+++ b/arch/ppc/platforms/lopec_setup.c
@@ -104,9 +104,9 @@ lopec_power_off(void)
#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)
int lopec_ide_ports_known = 0;
-static ide_ioreg_t lopec_ide_regbase[MAX_HWIFS];
-static ide_ioreg_t lopec_ide_ctl_regbase[MAX_HWIFS];
-static ide_ioreg_t lopec_idedma_regbase;
+static unsigned long lopec_ide_regbase[MAX_HWIFS];
+static unsigned long lopec_ide_ctl_regbase[MAX_HWIFS];
+static unsigned long lopec_idedma_regbase;
static void
lopec_ide_probe(void)
@@ -126,7 +126,7 @@ lopec_ide_probe(void)
}
static int
-lopec_ide_default_irq(ide_ioreg_t base)
+lopec_ide_default_irq(unsigned long base)
{
if (lopec_ide_ports_known == 0)
lopec_ide_probe();
@@ -139,7 +139,7 @@ lopec_ide_default_irq(ide_ioreg_t base)
return 0;
}
-static ide_ioreg_t
+static unsigned long
lopec_ide_default_io_base(int index)
{
if (lopec_ide_ports_known == 0)
@@ -148,10 +148,10 @@ lopec_ide_default_io_base(int index)
}
static void __init
-lopec_ide_init_hwif_ports(hw_regs_t *hw, ide_ioreg_t data,
- ide_ioreg_t ctl, int *irq)
+lopec_ide_init_hwif_ports(hw_regs_t *hw, unsigned long data,
+ unsigned long ctl, int *irq)
{
- ide_ioreg_t reg = data;
+ unsigned long reg = data;
uint alt_status_base;
int i;
diff --git a/arch/ppc/platforms/mcpn765_setup.c b/arch/ppc/platforms/mcpn765_setup.c
index 140d572013ae..91b6971cc6a2 100644
--- a/arch/ppc/platforms/mcpn765_setup.c
+++ b/arch/ppc/platforms/mcpn765_setup.c
@@ -274,9 +274,9 @@ mcpn765_show_cpuinfo(struct seq_file *m)
* IDE support.
*/
static int mcpn765_ide_ports_known = 0;
-static ide_ioreg_t mcpn765_ide_regbase[MAX_HWIFS];
-static ide_ioreg_t mcpn765_ide_ctl_regbase[MAX_HWIFS];
-static ide_ioreg_t mcpn765_idedma_regbase;
+static unsigned long mcpn765_ide_regbase[MAX_HWIFS];
+static unsigned long mcpn765_ide_ctl_regbase[MAX_HWIFS];
+static unsigned long mcpn765_idedma_regbase;
static void
mcpn765_ide_probe(void)
@@ -298,7 +298,7 @@ mcpn765_ide_probe(void)
}
static int
-mcpn765_ide_default_irq(ide_ioreg_t base)
+mcpn765_ide_default_irq(unsigned long base)
{
if (mcpn765_ide_ports_known == 0)
mcpn765_ide_probe();
@@ -311,7 +311,7 @@ mcpn765_ide_default_irq(ide_ioreg_t base)
return 0;
}
-static ide_ioreg_t
+static unsigned long
mcpn765_ide_default_io_base(int index)
{
if (mcpn765_ide_ports_known == 0)
@@ -321,10 +321,10 @@ mcpn765_ide_default_io_base(int index)
}
static void __init
-mcpn765_ide_init_hwif_ports(hw_regs_t *hw, ide_ioreg_t data_port,
- ide_ioreg_t ctrl_port, int *irq)
+mcpn765_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;
uint alt_status_base;
int i;
diff --git a/arch/ppc/platforms/menf1_setup.c b/arch/ppc/platforms/menf1_setup.c
index 6d8e19b6c1a7..3e8a75336a81 100644
--- a/arch/ppc/platforms/menf1_setup.c
+++ b/arch/ppc/platforms/menf1_setup.c
@@ -194,10 +194,10 @@ menf1_map_io(void)
/* IDE functions */
static void __init
-menf1_ide_init_hwif_ports (hw_regs_t *hw, ide_ioreg_t data_port,
- ide_ioreg_t ctrl_port, int *irq)
+menf1_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 = 8;
for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
@@ -215,7 +215,7 @@ menf1_ide_init_hwif_ports (hw_regs_t *hw, ide_ioreg_t data_port,
}
static int
-menf1_ide_default_irq(ide_ioreg_t base)
+menf1_ide_default_irq(unsigned long base)
{
if (base == MENF1_IDE0_BASE_ADDR)
return 14;
@@ -225,7 +225,7 @@ menf1_ide_default_irq(ide_ioreg_t base)
return 0;
}
-static ide_ioreg_t
+static unsigned long
menf1_ide_default_io_base(int index)
{
if (index == 0)
diff --git a/arch/ppc/platforms/pplus_setup.c b/arch/ppc/platforms/pplus_setup.c
index 2d7e98956624..751a06465e85 100644
--- a/arch/ppc/platforms/pplus_setup.c
+++ b/arch/ppc/platforms/pplus_setup.c
@@ -235,7 +235,7 @@ pplus_init_IRQ(void)
* IDE stuff.
*/
static int
-pplus_ide_default_irq(ide_ioreg_t base)
+pplus_ide_default_irq(unsigned long base)
{
switch (base) {
case 0x1f0: return 14;
@@ -244,7 +244,7 @@ pplus_ide_default_irq(ide_ioreg_t base)
}
}
-static ide_ioreg_t
+static unsigned long
pplus_ide_default_io_base(int index)
{
switch (index) {
@@ -256,9 +256,9 @@ pplus_ide_default_io_base(int index)
}
static void __init
-pplus_ide_init_hwif_ports (hw_regs_t *hw, ide_ioreg_t data_port, ide_ioreg_t ctrl_port, int *irq)
+pplus_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/arch/ppc/platforms/prep_setup.c b/arch/ppc/platforms/prep_setup.c
index c367cb2cb942..d5992324dd8b 100644
--- a/arch/ppc/platforms/prep_setup.c
+++ b/arch/ppc/platforms/prep_setup.c
@@ -1017,7 +1017,7 @@ prep_init_IRQ(void)
* IDE stuff.
*/
static int __prep
-prep_ide_default_irq(ide_ioreg_t base)
+prep_ide_default_irq(unsigned long base)
{
switch (base) {
case 0x1f0: return 13;
@@ -1030,7 +1030,7 @@ prep_ide_default_irq(ide_ioreg_t base)
}
}
-static ide_ioreg_t __prep
+static unsigned long __prep
prep_ide_default_io_base(int index)
{
switch (index) {
diff --git a/arch/ppc/platforms/sandpoint_setup.c b/arch/ppc/platforms/sandpoint_setup.c
index ebdb7b227c3f..a99f22a8857e 100644
--- a/arch/ppc/platforms/sandpoint_setup.c
+++ b/arch/ppc/platforms/sandpoint_setup.c
@@ -433,9 +433,9 @@ sandpoint_show_cpuinfo(struct seq_file *m)
* IDE support.
*/
static int sandpoint_ide_ports_known = 0;
-static ide_ioreg_t sandpoint_ide_regbase[MAX_HWIFS];
-static ide_ioreg_t sandpoint_ide_ctl_regbase[MAX_HWIFS];
-static ide_ioreg_t sandpoint_idedma_regbase;
+static unsigned long sandpoint_ide_regbase[MAX_HWIFS];
+static unsigned long sandpoint_ide_ctl_regbase[MAX_HWIFS];
+static unsigned long sandpoint_idedma_regbase;
static void
sandpoint_ide_probe(void)
@@ -457,7 +457,7 @@ sandpoint_ide_probe(void)
}
static int
-sandpoint_ide_default_irq(ide_ioreg_t base)
+sandpoint_ide_default_irq(unsigned long base)
{
if (sandpoint_ide_ports_known == 0)
sandpoint_ide_probe();
@@ -470,7 +470,7 @@ sandpoint_ide_default_irq(ide_ioreg_t base)
return 0;
}
-static ide_ioreg_t
+static unsigned long
sandpoint_ide_default_io_base(int index)
{
if (sandpoint_ide_ports_known == 0)
@@ -480,10 +480,10 @@ sandpoint_ide_default_io_base(int index)
}
static void __init
-sandpoint_ide_init_hwif_ports(hw_regs_t *hw, ide_ioreg_t data_port,
- ide_ioreg_t ctrl_port, int *irq)
+sandpoint_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;
uint alt_status_base;
int i;
diff --git a/arch/ppc/syslib/ppc4xx_setup.c b/arch/ppc/syslib/ppc4xx_setup.c
index 4d37c0d682c7..803e707e8880 100644
--- a/arch/ppc/syslib/ppc4xx_setup.c
+++ b/arch/ppc/syslib/ppc4xx_setup.c
@@ -228,8 +228,8 @@ ppc4xx_progress(char *s, unsigned short hex)
*/
#if defined(CONFIG_PCI) && defined(CONFIG_IDE)
static void
-ppc4xx_ide_init_hwif_ports(hw_regs_t * hw, ide_ioreg_t data_port,
- ide_ioreg_t ctrl_port, int *irq)
+ppc4xx_ide_init_hwif_ports(hw_regs_t * hw, unsigned long data_port,
+ unsigned long ctrl_port, int *irq)
{
int i;
diff --git a/include/asm-ppc/ide.h b/include/asm-ppc/ide.h
index fff6a4fc711a..815a662e03b8 100644
--- a/include/asm-ppc/ide.h
+++ b/include/asm-ppc/ide.h
@@ -33,11 +33,11 @@ extern void __ide_mm_insl(unsigned long port, void *addr, u32 count);
extern void __ide_mm_outsl(unsigned long port, void *addr, u32 count);
struct ide_machdep_calls {
- int (*default_irq)(ide_ioreg_t base);
- ide_ioreg_t (*default_io_base)(int index);
+ int (*default_irq)(unsigned long base);
+ unsigned long (*default_io_base)(int index);
void (*ide_init_hwif)(hw_regs_t *hw,
- ide_ioreg_t data_port,
- ide_ioreg_t ctrl_port,
+ unsigned long data_port,
+ unsigned long ctrl_port,
int *irq);
};
@@ -46,14 +46,14 @@ extern struct ide_machdep_calls ppc_ide_md;
#undef SUPPORT_SLOW_DATA_PORTS
#define SUPPORT_SLOW_DATA_PORTS 0
-static __inline__ int ide_default_irq(ide_ioreg_t base)
+static __inline__ int ide_default_irq(unsigned long base)
{
if (ppc_ide_md.default_irq)
return ppc_ide_md.default_irq(base);
return 0;
}
-static __inline__ ide_ioreg_t ide_default_io_base(int index)
+static __inline__ unsigned long ide_default_io_base(int index)
{
if (ppc_ide_md.default_io_base)
return ppc_ide_md.default_io_base(index);
@@ -66,10 +66,10 @@ static __inline__ ide_ioreg_t ide_default_io_base(int index)
* as the pmac IDE interfaces.
*/
static __inline__ void ide_init_hwif_ports(hw_regs_t *hw,
- ide_ioreg_t data_port,
- ide_ioreg_t ctrl_port, int *irq)
+ 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++)
@@ -92,7 +92,7 @@ static __inline__ void ide_init_default_hwifs(void)
#ifndef CONFIG_PCI
hw_regs_t hw;
int index;
- ide_ioreg_t base;
+ unsigned long base;
for (index = 0; index < MAX_HWIFS; index++) {
base = ide_default_io_base(index);
generated by cgit v1.2.3 (git 2.46.0) at 2026-02-09 19:13:01 +0000