Commit af8cdaa6 authored by Dave Jones's avatar Dave Jones

[PATCH] incorrect flags sizes.

parent 94c766d5
...@@ -610,7 +610,8 @@ static void sppp_channel_delete(struct channel_data *chan) ...@@ -610,7 +610,8 @@ static void sppp_channel_delete(struct channel_data *chan)
static int cosa_sppp_open(struct net_device *d) static int cosa_sppp_open(struct net_device *d)
{ {
struct channel_data *chan = d->priv; struct channel_data *chan = d->priv;
int err, flags; int err;
unsigned long flags;
if (!(chan->cosa->firmware_status & COSA_FW_START)) { if (!(chan->cosa->firmware_status & COSA_FW_START)) {
printk(KERN_NOTICE "%s: start the firmware first (status %d)\n", printk(KERN_NOTICE "%s: start the firmware first (status %d)\n",
...@@ -681,7 +682,7 @@ static void cosa_sppp_timeout(struct net_device *dev) ...@@ -681,7 +682,7 @@ static void cosa_sppp_timeout(struct net_device *dev)
static int cosa_sppp_close(struct net_device *d) static int cosa_sppp_close(struct net_device *d)
{ {
struct channel_data *chan = d->priv; struct channel_data *chan = d->priv;
int flags; unsigned long flags;
netif_stop_queue(d); netif_stop_queue(d);
sppp_close(d); sppp_close(d);
...@@ -778,7 +779,7 @@ static ssize_t cosa_read(struct file *file, ...@@ -778,7 +779,7 @@ static ssize_t cosa_read(struct file *file,
char *buf, size_t count, loff_t *ppos) char *buf, size_t count, loff_t *ppos)
{ {
DECLARE_WAITQUEUE(wait, current); DECLARE_WAITQUEUE(wait, current);
int flags; unsigned long flags;
struct channel_data *chan = (struct channel_data *)file->private_data; struct channel_data *chan = (struct channel_data *)file->private_data;
struct cosa_data *cosa = chan->cosa; struct cosa_data *cosa = chan->cosa;
char *kbuf; char *kbuf;
...@@ -855,7 +856,7 @@ static ssize_t cosa_write(struct file *file, ...@@ -855,7 +856,7 @@ static ssize_t cosa_write(struct file *file,
DECLARE_WAITQUEUE(wait, current); DECLARE_WAITQUEUE(wait, current);
struct channel_data *chan = (struct channel_data *)file->private_data; struct channel_data *chan = (struct channel_data *)file->private_data;
struct cosa_data *cosa = chan->cosa; struct cosa_data *cosa = chan->cosa;
unsigned int flags; unsigned long flags;
char *kbuf; char *kbuf;
if (!(cosa->firmware_status & COSA_FW_START)) { if (!(cosa->firmware_status & COSA_FW_START)) {
...@@ -1242,7 +1243,7 @@ static void cosa_disable_rx(struct channel_data *chan) ...@@ -1242,7 +1243,7 @@ static void cosa_disable_rx(struct channel_data *chan)
static int cosa_start_tx(struct channel_data *chan, char *buf, int len) static int cosa_start_tx(struct channel_data *chan, char *buf, int len)
{ {
struct cosa_data *cosa = chan->cosa; struct cosa_data *cosa = chan->cosa;
int flags; unsigned long flags;
#ifdef DEBUG_DATA #ifdef DEBUG_DATA
int i; int i;
...@@ -1268,7 +1269,7 @@ static int cosa_start_tx(struct channel_data *chan, char *buf, int len) ...@@ -1268,7 +1269,7 @@ static int cosa_start_tx(struct channel_data *chan, char *buf, int len)
static void put_driver_status(struct cosa_data *cosa) static void put_driver_status(struct cosa_data *cosa)
{ {
unsigned flags=0; unsigned long flags;
int status; int status;
spin_lock_irqsave(&cosa->lock, flags); spin_lock_irqsave(&cosa->lock, flags);
...@@ -1336,7 +1337,7 @@ static void put_driver_status_nolock(struct cosa_data *cosa) ...@@ -1336,7 +1337,7 @@ static void put_driver_status_nolock(struct cosa_data *cosa)
*/ */
static void cosa_kick(struct cosa_data *cosa) static void cosa_kick(struct cosa_data *cosa)
{ {
unsigned flags, flags1; unsigned long flags, flags1;
char *s = "(probably) IRQ"; char *s = "(probably) IRQ";
if (test_bit(RXBIT, &cosa->rxtx)) if (test_bit(RXBIT, &cosa->rxtx))
......
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