git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
isdn
/
hisax
/
elsa_ser.c
diff --git
a/drivers/isdn/hisax/elsa_ser.c
b/drivers/isdn/hisax/elsa_ser.c
index
479164b
..
0279fb3
100644
(file)
--- a/
drivers/isdn/hisax/elsa_ser.c
+++ b/
drivers/isdn/hisax/elsa_ser.c
@@
-7,7
+7,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/serial.h>
#include <linux/serial_reg.h>
#include <linux/serial.h>
#include <linux/serial_reg.h>
@@
-237,7
+236,7
@@
static void mshutdown(struct IsdnCardState *cs)
#endif
}
#endif
}
-inline int
+
static
inline int
write_modem(struct BCState *bcs) {
int ret=0;
struct IsdnCardState *cs = bcs->cs;
write_modem(struct BCState *bcs) {
int ret=0;
struct IsdnCardState *cs = bcs->cs;
@@
-275,7
+274,7
@@
write_modem(struct BCState *bcs) {
return(ret);
}
return(ret);
}
-inline void
+
static
inline void
modem_fill(struct BCState *bcs) {
if (bcs->tx_skb) {
modem_fill(struct BCState *bcs) {
if (bcs->tx_skb) {
@@
-401,7
+400,7
@@
static void rs_interrupt_elsa(int irq, struct IsdnCardState *cs)
if (status & UART_LSR_DR)
receive_chars(cs, &status);
if (status & UART_LSR_THRE)
if (status & UART_LSR_DR)
receive_chars(cs, &status);
if (status & UART_LSR_THRE)
- transmit_chars(cs,
0
);
+ transmit_chars(cs,
NULL
);
if (pass_counter++ > RS_ISR_PASS_LIMIT) {
printk("rs_single loop break.\n");
break;
if (pass_counter++ > RS_ISR_PASS_LIMIT) {
printk("rs_single loop break.\n");
break;
@@
-422,7
+421,7
@@
extern int open_hscxstate(struct IsdnCardState *cs, struct BCState *bcs);
extern void modehscx(struct BCState *bcs, int mode, int bc);
extern void hscx_l2l1(struct PStack *st, int pr, void *arg);
extern void modehscx(struct BCState *bcs, int mode, int bc);
extern void hscx_l2l1(struct PStack *st, int pr, void *arg);
-void
+
static
void
close_elsastate(struct BCState *bcs)
{
modehscx(bcs, 0, bcs->channel);
close_elsastate(struct BCState *bcs)
{
modehscx(bcs, 0, bcs->channel);
@@
-442,7
+441,7
@@
close_elsastate(struct BCState *bcs)
}
}
}
}
-void
+
static
void
modem_write_cmd(struct IsdnCardState *cs, u_char *buf, int len) {
int count, fp;
u_char *msg = buf;
modem_write_cmd(struct IsdnCardState *cs, u_char *buf, int len) {
int count, fp;
u_char *msg = buf;
@@
-472,7
+471,7
@@
modem_write_cmd(struct IsdnCardState *cs, u_char *buf, int len) {
}
}
}
}
-void
+
static
void
modem_set_init(struct IsdnCardState *cs) {
int timeout;
modem_set_init(struct IsdnCardState *cs) {
int timeout;
@@
-521,7
+520,7
@@
modem_set_init(struct IsdnCardState *cs) {
udelay(RCV_DELAY);
}
udelay(RCV_DELAY);
}
-void
+
static
void
modem_set_dial(struct IsdnCardState *cs, int outgoing) {
int timeout;
#define RCV_DELAY 20000
modem_set_dial(struct IsdnCardState *cs, int outgoing) {
int timeout;
#define RCV_DELAY 20000
@@
-543,7
+542,7
@@
modem_set_dial(struct IsdnCardState *cs, int outgoing) {
udelay(RCV_DELAY);
}
udelay(RCV_DELAY);
}
-void
+
static
void
modem_l2l1(struct PStack *st, int pr, void *arg)
{
struct BCState *bcs = st->l1.bcs;
modem_l2l1(struct PStack *st, int pr, void *arg)
{
struct BCState *bcs = st->l1.bcs;
@@
-579,7
+578,7
@@
modem_l2l1(struct PStack *st, int pr, void *arg)
}
}
}
}
-int
+
static
int
setstack_elsa(struct PStack *st, struct BCState *bcs)
{
setstack_elsa(struct PStack *st, struct BCState *bcs)
{
@@
-614,7
+613,7
@@
setstack_elsa(struct PStack *st, struct BCState *bcs)
return (0);
}
return (0);
}
-void
+
static
void
init_modem(struct IsdnCardState *cs) {
cs->bcs[0].BC_SetStack = setstack_elsa;
init_modem(struct IsdnCardState *cs) {
cs->bcs[0].BC_SetStack = setstack_elsa;
@@
-641,7
+640,7
@@
init_modem(struct IsdnCardState *cs) {
modem_set_init(cs);
}
modem_set_init(cs);
}
-void
+
static
void
release_modem(struct IsdnCardState *cs) {
cs->hw.elsa.MFlag = 0;
release_modem(struct IsdnCardState *cs) {
cs->hw.elsa.MFlag = 0;