git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
[pandora-kernel.git]
/
drivers
/
char
/
ip2
/
i2lib.c
diff --git
a/drivers/char/ip2/i2lib.c
b/drivers/char/ip2/i2lib.c
index
54d93f0
..
7804576
100644
(file)
--- a/
drivers/char/ip2/i2lib.c
+++ b/
drivers/char/ip2/i2lib.c
@@
-84,8
+84,8
@@
static void iiSendPendingMail(i2eBordStrPtr);
static void serviceOutgoingFifo(i2eBordStrPtr);
// Functions defined in ip2.c as part of interrupt handling
static void serviceOutgoingFifo(i2eBordStrPtr);
// Functions defined in ip2.c as part of interrupt handling
-static void do_input(
void
*);
-static void do_status(
void
*);
+static void do_input(
struct work_struct
*);
+static void do_status(
struct work_struct
*);
//***************
//* Debug Data *
//***************
//* Debug Data *
@@
-331,8
+331,8
@@
i2InitChannels ( i2eBordStrPtr pB, int nChannels, i2ChanStrPtr pCh)
pCh->ClosingWaitTime = 30*HZ;
// Initialize task queue objects
pCh->ClosingWaitTime = 30*HZ;
// Initialize task queue objects
- INIT_WORK(&pCh->tqueue_input, do_input
, pCh
);
- INIT_WORK(&pCh->tqueue_status, do_status
, pCh
);
+ INIT_WORK(&pCh->tqueue_input, do_input);
+ INIT_WORK(&pCh->tqueue_status, do_status);
#ifdef IP2DEBUG_TRACE
pCh->trace = ip2trace;
#ifdef IP2DEBUG_TRACE
pCh->trace = ip2trace;
@@
-1016,7
+1016,6
@@
i2Output(i2ChanStrPtr pCh, const char *pSource, int count)
unsigned short channel;
unsigned short stuffIndex;
unsigned long flags;
unsigned short channel;
unsigned short stuffIndex;
unsigned long flags;
- int rc = 0;
int bailout = 10;
int bailout = 10;
@@
-1573,7
+1572,7
@@
i2StripFifo(i2eBordStrPtr pB)
#ifdef USE_IQ
schedule_work(&pCh->tqueue_input);
#else
#ifdef USE_IQ
schedule_work(&pCh->tqueue_input);
#else
- do_input(
pCh
);
+ do_input(
&pCh->tqueue_input
);
#endif
// Note we do not need to maintain any flow-control credits at this
#endif
// Note we do not need to maintain any flow-control credits at this
@@
-1810,7
+1809,7
@@
i2StripFifo(i2eBordStrPtr pB)
#ifdef USE_IQ
schedule_work(&pCh->tqueue_status);
#else
#ifdef USE_IQ
schedule_work(&pCh->tqueue_status);
#else
- do_status(
pCh
);
+ do_status(
&pCh->tqueue_status
);
#endif
}
}
#endif
}
}