Commit 09f6a259 authored by Dave Jones's avatar Dave Jones Committed by Linus Torvalds

[PATCH] Various drivers using longs instead of ulongs for flags.

parent e41409f3
...@@ -79,7 +79,7 @@ EXPORT_SYMBOL(pi_read_block); ...@@ -79,7 +79,7 @@ EXPORT_SYMBOL(pi_read_block);
static void pi_wake_up( void *p) static void pi_wake_up( void *p)
{ PIA *pi = (PIA *) p; { PIA *pi = (PIA *) p;
long flags; unsigned long flags;
void (*cont)(void) = NULL; void (*cont)(void) = NULL;
spin_lock_irqsave(&pi_spinlock,flags); spin_lock_irqsave(&pi_spinlock,flags);
...@@ -103,7 +103,7 @@ void pi_do_claimed( PIA *pi, void(*cont)(void)) ...@@ -103,7 +103,7 @@ void pi_do_claimed( PIA *pi, void(*cont)(void))
#ifdef CONFIG_PARPORT #ifdef CONFIG_PARPORT
{ long flags; { unsigned long flags;
spin_lock_irqsave(&pi_spinlock,flags); spin_lock_irqsave(&pi_spinlock,flags);
......
...@@ -762,7 +762,7 @@ static void pcd_start(void) ...@@ -762,7 +762,7 @@ static void pcd_start(void)
{ {
int b, i; int b, i;
char rd_cmd[12] = { 0xa8, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }; char rd_cmd[12] = { 0xa8, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 };
long saved_flags; unsigned long saved_flags;
pcd_bufblk = pcd_sector / 4; pcd_bufblk = pcd_sector / 4;
b = pcd_bufblk; b = pcd_bufblk;
...@@ -792,7 +792,7 @@ static void do_pcd_read(void) ...@@ -792,7 +792,7 @@ static void do_pcd_read(void)
pcd_retries = 0; pcd_retries = 0;
pcd_transfer(); pcd_transfer();
if (!pcd_count) { if (!pcd_count) {
long saved_flags; unsigned long saved_flags;
spin_lock_irqsave(&pcd_lock, saved_flags); spin_lock_irqsave(&pcd_lock, saved_flags);
end_request(CURRENT, 1); end_request(CURRENT, 1);
pcd_busy = 0; pcd_busy = 0;
...@@ -806,7 +806,7 @@ static void do_pcd_read(void) ...@@ -806,7 +806,7 @@ static void do_pcd_read(void)
static void do_pcd_read_drq(void) static void do_pcd_read_drq(void)
{ {
long saved_flags; unsigned long saved_flags;
if (pcd_completion(pcd_current, pcd_buffer, "read block")) { if (pcd_completion(pcd_current, pcd_buffer, "read block")) {
if (pcd_retries < PCD_RETRIES) { if (pcd_retries < PCD_RETRIES) {
......
...@@ -56,7 +56,7 @@ static void ps_set_intr( void (*continuation)(void), ...@@ -56,7 +56,7 @@ static void ps_set_intr( void (*continuation)(void),
int (*ready)(void), int (*ready)(void),
int timeout, int nice ) int timeout, int nice )
{ long flags; { unsigned long flags;
spin_lock_irqsave(&ps_spinlock,flags); spin_lock_irqsave(&ps_spinlock,flags);
...@@ -86,7 +86,7 @@ static void ps_set_intr( void (*continuation)(void), ...@@ -86,7 +86,7 @@ static void ps_set_intr( void (*continuation)(void),
static void ps_tq_int( void *data ) static void ps_tq_int( void *data )
{ void (*con)(void); { void (*con)(void);
long flags; unsigned long flags;
spin_lock_irqsave(&ps_spinlock,flags); spin_lock_irqsave(&ps_spinlock,flags);
...@@ -121,7 +121,7 @@ static void ps_tq_int( void *data ) ...@@ -121,7 +121,7 @@ static void ps_tq_int( void *data )
static void ps_timer_int( unsigned long data) static void ps_timer_int( unsigned long data)
{ void (*con)(void); { void (*con)(void);
long flags; unsigned long flags;
spin_lock_irqsave(&ps_spinlock,flags); spin_lock_irqsave(&ps_spinlock,flags);
......
...@@ -511,7 +511,7 @@ void gs_start(struct tty_struct * tty) ...@@ -511,7 +511,7 @@ void gs_start(struct tty_struct * tty)
void gs_shutdown_port (struct gs_port *port) void gs_shutdown_port (struct gs_port *port)
{ {
long flags; unsigned long flags;
func_enter(); func_enter();
......
...@@ -8002,7 +8002,7 @@ int mgsl_sppp_open(struct net_device *d) ...@@ -8002,7 +8002,7 @@ int mgsl_sppp_open(struct net_device *d)
{ {
struct mgsl_struct *info = d->priv; struct mgsl_struct *info = d->priv;
int err; int err;
long flags; unsigned long flags;
if (debug_level >= DEBUG_LEVEL_INFO) if (debug_level >= DEBUG_LEVEL_INFO)
printk("mgsl_sppp_open(%s)\n",info->netname); printk("mgsl_sppp_open(%s)\n",info->netname);
...@@ -8045,7 +8045,7 @@ int mgsl_sppp_open(struct net_device *d) ...@@ -8045,7 +8045,7 @@ int mgsl_sppp_open(struct net_device *d)
void mgsl_sppp_tx_timeout(struct net_device *dev) void mgsl_sppp_tx_timeout(struct net_device *dev)
{ {
struct mgsl_struct *info = dev->priv; struct mgsl_struct *info = dev->priv;
long flags; unsigned long flags;
if (debug_level >= DEBUG_LEVEL_INFO) if (debug_level >= DEBUG_LEVEL_INFO)
printk("mgsl_sppp_tx_timeout(%s)\n",info->netname); printk("mgsl_sppp_tx_timeout(%s)\n",info->netname);
......
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