Skip to content

L
linux
Commit fc103349 authored by Ralf Baechle's avatar Ralf Baechle
Browse files
Options

[MIPS] Remove BSD and Sys V compat data types. 

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 89e22d15
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 47 deletions
arch/mips/au1000/common/irq.c
View file @ fc103349
...@@ -585,13 +585,13 @@ void intc1_req1_irqdispatch(struct pt_regs *regs) ...@@ -585,13 +585,13 @@ void intc1_req1_irqdispatch(struct pt_regs *regs)
* au_sleep function in power.c.....maybe I should just pm_register() * au_sleep function in power.c.....maybe I should just pm_register()
* them instead? * them instead?
*/ */
static uint sleep_intctl_config0[2]; static unsigned int sleep_intctl_config0[2];
static uint sleep_intctl_config1[2]; static unsigned int sleep_intctl_config1[2];
static uint sleep_intctl_config2[2]; static unsigned int sleep_intctl_config2[2];
static uint sleep_intctl_src[2]; static unsigned int sleep_intctl_src[2];
static uint sleep_intctl_assign[2]; static unsigned int sleep_intctl_assign[2];
static uint sleep_intctl_wake[2]; static unsigned int sleep_intctl_wake[2];
static uint sleep_intctl_mask[2]; static unsigned int sleep_intctl_mask[2];
void void
save_au1xxx_intctl(void) save_au1xxx_intctl(void)
......
arch/mips/au1000/common/power.c
View file @ fc103349
...@@ -80,17 +80,17 @@ static DEFINE_SPINLOCK(pm_lock); ...@@ -80,17 +80,17 @@ static DEFINE_SPINLOCK(pm_lock);
* We only have to save/restore registers that aren't otherwise * We only have to save/restore registers that aren't otherwise
* done as part of a driver pm_* function. * done as part of a driver pm_* function.
*/ */
static uint sleep_aux_pll_cntrl; static unsigned int sleep_aux_pll_cntrl;
static uint sleep_cpu_pll_cntrl; static unsigned int sleep_cpu_pll_cntrl;
static uint sleep_pin_function; static unsigned int sleep_pin_function;
static uint sleep_uart0_inten; static unsigned int sleep_uart0_inten;
static uint sleep_uart0_fifoctl; static unsigned int sleep_uart0_fifoctl;
static uint sleep_uart0_linectl; static unsigned int sleep_uart0_linectl;
static uint sleep_uart0_clkdiv; static unsigned int sleep_uart0_clkdiv;
static uint sleep_uart0_enable; static unsigned int sleep_uart0_enable;
static uint sleep_usbhost_enable; static unsigned int sleep_usbhost_enable;
static uint sleep_usbdev_enable; static unsigned int sleep_usbdev_enable;
static uint sleep_static_memctlr[4][3]; static unsigned int sleep_static_memctlr[4][3];
/* Define this to cause the value you write to /proc/sys/pm/sleep to /* Define this to cause the value you write to /proc/sys/pm/sleep to
* set the TOY timer for the amount of time you want to sleep. * set the TOY timer for the amount of time you want to sleep.
......
arch/mips/au1000/csb250/init.c
View file @ fc103349
...@@ -65,9 +65,9 @@ int __init prom_init(int argc, char **argv, char **envp, int *prom_vec) ...@@ -65,9 +65,9 @@ int __init prom_init(int argc, char **argv, char **envp, int *prom_vec)
/* We use a0 and a1 to pass initrd start and size. /* We use a0 and a1 to pass initrd start and size.
*/ */
if (((uint) argc > 0) && ((uint)argv > 0)) { if (((unsigned int) argc > 0) && ((uint)argv > 0)) {
my_initrd_start = (uint)argc; my_initrd_start = (unsigned int)argc;
my_initrd_size = (uint)argv; my_initrd_size = (unsigned int)argv;
} }
/* First argv is ignored. /* First argv is ignored.
......
arch/mips/gt64120/momenco_ocelot/setup.c
View file @ fc103349
...@@ -164,8 +164,8 @@ void __init plat_mem_setup(void) ...@@ -164,8 +164,8 @@ void __init plat_mem_setup(void)
pm_power_off = momenco_ocelot_power_off; pm_power_off = momenco_ocelot_power_off;
/* /*
* initrd_start = (ulong)ocelot_initrd_start; * initrd_start = (unsigned long)ocelot_initrd_start;
* initrd_end = (ulong)ocelot_initrd_start + (ulong)ocelot_initrd_size; * initrd_end = (unsigned long)ocelot_initrd_start + (ulong)ocelot_initrd_size;
* initrd_below_start_ok = 1; * initrd_below_start_ok = 1;
*/ */
......
arch/mips/kernel/apm.c
View file @ fc103349
...@@ -260,7 +260,7 @@ static unsigned int apm_poll(struct file *fp, poll_table * wait) ...@@ -260,7 +260,7 @@ static unsigned int apm_poll(struct file *fp, poll_table * wait)
* has acknowledge does the actual suspend happen. * has acknowledge does the actual suspend happen.
*/ */
static int static int
apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg) apm_ioctl(struct inode * inode, struct file *filp, unsigned int cmd, unsigned long arg)
{ {
struct apm_user *as = filp->private_data; struct apm_user *as = filp->private_data;
unsigned long flags; unsigned long flags;
......
arch/mips/kernel/syscall.c
View file @ fc103349
...@@ -301,7 +301,7 @@ asmlinkage int _sys_sysmips(int cmd, long arg1, int arg2, int arg3) ...@@ -301,7 +301,7 @@ asmlinkage int _sys_sysmips(int cmd, long arg1, int arg2, int arg3)
* *
* This is really horribly ugly. * This is really horribly ugly.
*/ */
asmlinkage int sys_ipc (uint call, int first, int second, asmlinkage int sys_ipc (unsigned int call, int first, int second,
unsigned long third, void __user *ptr, long fifth) unsigned long third, void __user *ptr, long fifth)
{ {
int version, ret; int version, ret;
...@@ -359,18 +359,18 @@ asmlinkage int sys_ipc (uint call, int first, int second, ...@@ -359,18 +359,18 @@ asmlinkage int sys_ipc (uint call, int first, int second,
case SHMAT: case SHMAT:
switch (version) { switch (version) {
default: { default: {
ulong raddr; unsigned long raddr;
ret = do_shmat (first, (char __user *) ptr, second, ret = do_shmat (first, (char __user *) ptr, second,
&raddr); &raddr);
if (ret) if (ret)
return ret; return ret;
return put_user (raddr, (ulong __user *) third); return put_user (raddr, (unsigned long __user *) third);
} }
case 1: /* iBCS2 emulator entry point */ case 1: /* iBCS2 emulator entry point */
if (!segment_eq(get_fs(), get_ds())) if (!segment_eq(get_fs(), get_ds()))
return -EINVAL; return -EINVAL;
return do_shmat (first, (char __user *) ptr, second, return do_shmat (first, (char __user *) ptr, second,
(ulong *) third); (unsigned long *) third);
} }
case SHMDT: case SHMDT:
return sys_shmdt ((char __user *)ptr); return sys_shmdt ((char __user *)ptr);
......
arch/mips/momentum/jaguar_atx/setup.c
View file @ fc103349
...@@ -370,8 +370,8 @@ void __init plat_mem_setup(void) ...@@ -370,8 +370,8 @@ void __init plat_mem_setup(void)
pm_power_off = momenco_jaguar_power_off; pm_power_off = momenco_jaguar_power_off;
/* /*
* initrd_start = (ulong)jaguar_initrd_start; * initrd_start = (unsigned long)jaguar_initrd_start;
* initrd_end = (ulong)jaguar_initrd_start + (ulong)jaguar_initrd_size; * initrd_end = (unsigned long)jaguar_initrd_start + (ulong)jaguar_initrd_size;
* initrd_below_start_ok = 1; * initrd_below_start_ok = 1;
*/ */
......
arch/mips/momentum/ocelot_c/setup.c
View file @ fc103349
...@@ -242,8 +242,8 @@ void __init plat_mem_setup(void) ...@@ -242,8 +242,8 @@ void __init plat_mem_setup(void)
pm_power_off = momenco_ocelot_power_off; pm_power_off = momenco_ocelot_power_off;
/* /*
* initrd_start = (ulong)ocelot_initrd_start; * initrd_start = (unsigned long)ocelot_initrd_start;
* initrd_end = (ulong)ocelot_initrd_start + (ulong)ocelot_initrd_size; * initrd_end = (unsigned long)ocelot_initrd_start + (ulong)ocelot_initrd_size;
* initrd_below_start_ok = 1; * initrd_below_start_ok = 1;
*/ */
......
arch/mips/momentum/ocelot_g/setup.c
View file @ fc103349
...@@ -174,8 +174,8 @@ void __init plat_mem_setup(void) ...@@ -174,8 +174,8 @@ void __init plat_mem_setup(void)
pm_power_off = momenco_ocelot_power_off; pm_power_off = momenco_ocelot_power_off;
/* /*
* initrd_start = (ulong)ocelot_initrd_start; * initrd_start = (unsigned long)ocelot_initrd_start;
* initrd_end = (ulong)ocelot_initrd_start + (ulong)ocelot_initrd_size; * initrd_end = (unsigned long)ocelot_initrd_start + (ulong)ocelot_initrd_size;
* initrd_below_start_ok = 1; * initrd_below_start_ok = 1;
*/ */
......
arch/mips/pci/ops-tx4927.c
View file @ fc103349
...@@ -119,7 +119,7 @@ static int tx4927_pcibios_read_config(struct pci_bus *bus, unsigned int devfn, i ...@@ -119,7 +119,7 @@ static int tx4927_pcibios_read_config(struct pci_bus *bus, unsigned int devfn, i
switch (size) { switch (size) {
case 1: case 1:
*val = *(volatile u8 *) ((ulong) & tx4927_pcicptr-> *val = *(volatile u8 *) ((unsigned long) & tx4927_pcicptr->
g2pcfgdata | g2pcfgdata |
#ifdef __LITTLE_ENDIAN #ifdef __LITTLE_ENDIAN
(where & 3)); (where & 3));
...@@ -128,7 +128,7 @@ static int tx4927_pcibios_read_config(struct pci_bus *bus, unsigned int devfn, i ...@@ -128,7 +128,7 @@ static int tx4927_pcibios_read_config(struct pci_bus *bus, unsigned int devfn, i
#endif #endif
break; break;
case 2: case 2:
*val = *(volatile u16 *) ((ulong) & tx4927_pcicptr-> *val = *(volatile u16 *) ((unsigned long) & tx4927_pcicptr->
g2pcfgdata | g2pcfgdata |
#ifdef __LITTLE_ENDIAN #ifdef __LITTLE_ENDIAN
(where & 3)); (where & 3));
...@@ -168,7 +168,7 @@ static int tx4927_pcibios_write_config(struct pci_bus *bus, unsigned int devfn, ...@@ -168,7 +168,7 @@ static int tx4927_pcibios_write_config(struct pci_bus *bus, unsigned int devfn,
switch (size) { switch (size) {
case 1: case 1:
*(volatile u8 *) ((ulong) & tx4927_pcicptr-> *(volatile u8 *) ((unsigned long) & tx4927_pcicptr->
g2pcfgdata | g2pcfgdata |
#ifdef __LITTLE_ENDIAN #ifdef __LITTLE_ENDIAN
(where & 3)) = val; (where & 3)) = val;
...@@ -178,7 +178,7 @@ static int tx4927_pcibios_write_config(struct pci_bus *bus, unsigned int devfn, ...@@ -178,7 +178,7 @@ static int tx4927_pcibios_write_config(struct pci_bus *bus, unsigned int devfn,
break; break;
case 2: case 2:
*(volatile u16 *) ((ulong) & tx4927_pcicptr-> *(volatile u16 *) ((unsigned long) & tx4927_pcicptr->
g2pcfgdata | g2pcfgdata |
#ifdef __LITTLE_ENDIAN #ifdef __LITTLE_ENDIAN
(where & 3)) = val; (where & 3)) = val;
......
arch/mips/pci/ops-tx4938.c
View file @ fc103349
...@@ -106,7 +106,7 @@ static int tx4938_pcibios_read_config(struct pci_bus *bus, unsigned int devfn, ...@@ -106,7 +106,7 @@ static int tx4938_pcibios_read_config(struct pci_bus *bus, unsigned int devfn,
switch (size) { switch (size) {
case 1: case 1:
*val = *(volatile u8 *) ((ulong) & tx4938_pcicptr->g2pcfgdata | *val = *(volatile u8 *) ((unsigned long) & tx4938_pcicptr->g2pcfgdata |
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
((where & 3) ^ 3)); ((where & 3) ^ 3));
#else #else
...@@ -114,7 +114,7 @@ static int tx4938_pcibios_read_config(struct pci_bus *bus, unsigned int devfn, ...@@ -114,7 +114,7 @@ static int tx4938_pcibios_read_config(struct pci_bus *bus, unsigned int devfn,
#endif #endif
break; break;
case 2: case 2:
*val = *(volatile u16 *) ((ulong) & tx4938_pcicptr->g2pcfgdata | *val = *(volatile u16 *) ((unsigned long) & tx4938_pcicptr->g2pcfgdata |
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
((where & 3) ^ 2)); ((where & 3) ^ 2));
#else #else
...@@ -154,7 +154,7 @@ static int tx4938_pcibios_write_config(struct pci_bus *bus, unsigned int devfn, ...@@ -154,7 +154,7 @@ static int tx4938_pcibios_write_config(struct pci_bus *bus, unsigned int devfn,
switch (size) { switch (size) {
case 1: case 1:
*(volatile u8 *) ((ulong) & tx4938_pcicptr->g2pcfgdata | *(volatile u8 *) ((unsigned long) & tx4938_pcicptr->g2pcfgdata |
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
((where & 3) ^ 3)) = val; ((where & 3) ^ 3)) = val;
#else #else
...@@ -162,7 +162,7 @@ static int tx4938_pcibios_write_config(struct pci_bus *bus, unsigned int devfn, ...@@ -162,7 +162,7 @@ static int tx4938_pcibios_write_config(struct pci_bus *bus, unsigned int devfn,
#endif #endif
break; break;
case 2: case 2:
*(volatile u16 *) ((ulong) & tx4938_pcicptr->g2pcfgdata | *(volatile u16 *) ((unsigned long) & tx4938_pcicptr->g2pcfgdata |
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
((where & 0x3) ^ 0x2)) = val; ((where & 0x3) ^ 0x2)) = val;
#else #else
......
include/asm-mips/sn/klconfig.h
View file @ fc103349
...@@ -602,7 +602,7 @@ typedef struct klcpu_s { /* CPU */ ...@@ -602,7 +602,7 @@ typedef struct klcpu_s { /* CPU */
typedef struct klhub_s { /* HUB */ typedef struct klhub_s { /* HUB */
klinfo_t hub_info; klinfo_t hub_info;
uint hub_flags; /* PCFG_HUB_xxx flags */ unsigned int hub_flags; /* PCFG_HUB_xxx flags */
klport_t hub_port; /* hub is connected to this */ klport_t hub_port; /* hub is connected to this */
nic_t hub_box_nic; /* nic of containing box */ nic_t hub_box_nic; /* nic of containing box */
klconf_off_t hub_mfg_nic; /* MFG NIC string */ klconf_off_t hub_mfg_nic; /* MFG NIC string */
...@@ -611,7 +611,7 @@ typedef struct klhub_s { /* HUB */ ...@@ -611,7 +611,7 @@ typedef struct klhub_s { /* HUB */
typedef struct klhub_uart_s { /* HUB */ typedef struct klhub_uart_s { /* HUB */
klinfo_t hubuart_info; klinfo_t hubuart_info;
uint hubuart_flags; /* PCFG_HUB_xxx flags */ unsigned int hubuart_flags; /* PCFG_HUB_xxx flags */
nic_t hubuart_box_nic; /* nic of containing box */ nic_t hubuart_box_nic; /* nic of containing box */
} klhub_uart_t ; } klhub_uart_t ;
...@@ -710,7 +710,7 @@ typedef struct klvmed_s { /* VME DEVICE - VME BOARD */ ...@@ -710,7 +710,7 @@ typedef struct klvmed_s { /* VME DEVICE - VME BOARD */
/* XXX - Don't we need the number of ports here?!? */ /* XXX - Don't we need the number of ports here?!? */
typedef struct klrou_s { /* ROUTER */ typedef struct klrou_s { /* ROUTER */
klinfo_t rou_info ; klinfo_t rou_info ;
uint rou_flags ; /* PCFG_ROUTER_xxx flags */ unsigned int rou_flags ; /* PCFG_ROUTER_xxx flags */
nic_t rou_box_nic ; /* nic of the containing module */ nic_t rou_box_nic ; /* nic of the containing module */
klport_t rou_port[MAX_ROUTER_PORTS + 1] ; /* array index 1 to 6 */ klport_t rou_port[MAX_ROUTER_PORTS + 1] ; /* array index 1 to 6 */
klconf_off_t rou_mfg_nic ; /* MFG NIC string */ klconf_off_t rou_mfg_nic ; /* MFG NIC string */
...@@ -733,8 +733,8 @@ typedef struct klgfx_s { /* GRAPHICS Device */ ...@@ -733,8 +733,8 @@ typedef struct klgfx_s { /* GRAPHICS Device */
klinfo_t gfx_info; klinfo_t gfx_info;
klconf_off_t old_gndevs; /* for compatibility with older proms */ klconf_off_t old_gndevs; /* for compatibility with older proms */
klconf_off_t old_gdoff0; /* for compatibility with older proms */ klconf_off_t old_gdoff0; /* for compatibility with older proms */
uint cookie; /* for compatibility with older proms */ unsigned int cookie; /* for compatibility with older proms */
uint moduleslot; unsigned int moduleslot;
struct klgfx_s *gfx_next_pipe; struct klgfx_s *gfx_next_pipe;
graphics_t gfx_specific; graphics_t gfx_specific;
klconf_off_t pad0; /* for compatibility with older proms */ klconf_off_t pad0; /* for compatibility with older proms */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7