From f2b74e9b7868e01f696e1dd4043e67b9ccec6fea Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Sun, 8 Jan 2006 01:02:16 -0800 Subject: [PATCH] --- yaml --- r: 16927 b: refs/heads/master c: b7b4d7a4666454b40b45a853bd1d296af37a85f0 h: refs/heads/master i: 16925: ebac87df98f71e6466c1fb484208e8b68b4d5596 16923: 94240990d8ea7fb4d36366f5e3f2a2bd3ca8abcf 16919: f6b42b5b0802b3d7dcc5ab231c5743183a4b0ccf 16911: 75dd0f5603c7880013f85ec147c48ceb3bb96d63 16895: a85d3e6e5abd1aa966e773f78ae5fd6257f8cfd6 v: v3 --- [refs] | 2 +- trunk/drivers/isdn/act2000/act2000.h | 6 +++--- trunk/drivers/isdn/act2000/capi.h | 2 +- trunk/drivers/isdn/sc/command.c | 1 - 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 1f1a66aaf940..ccde4c3715dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a10e0b28b196051ae71829e5b989cba00513289 +refs/heads/master: b7b4d7a4666454b40b45a853bd1d296af37a85f0 diff --git a/trunk/drivers/isdn/act2000/act2000.h b/trunk/drivers/isdn/act2000/act2000.h index b091d1a54125..d4c50512a1ff 100644 --- a/trunk/drivers/isdn/act2000/act2000.h +++ b/trunk/drivers/isdn/act2000/act2000.h @@ -181,17 +181,17 @@ typedef struct act2000_card { char regname[35]; /* Name used for request_region */ } act2000_card; -extern __inline__ void act2000_schedule_tx(act2000_card *card) +static inline void act2000_schedule_tx(act2000_card *card) { schedule_work(&card->snd_tq); } -extern __inline__ void act2000_schedule_rx(act2000_card *card) +static inline void act2000_schedule_rx(act2000_card *card) { schedule_work(&card->rcv_tq); } -extern __inline__ void act2000_schedule_poll(act2000_card *card) +static inline void act2000_schedule_poll(act2000_card *card) { schedule_work(&card->poll_tq); } diff --git a/trunk/drivers/isdn/act2000/capi.h b/trunk/drivers/isdn/act2000/capi.h index f6d5f530b86b..e82a9289ad96 100644 --- a/trunk/drivers/isdn/act2000/capi.h +++ b/trunk/drivers/isdn/act2000/capi.h @@ -330,7 +330,7 @@ typedef struct actcapi_msg { } msg; } actcapi_msg; -extern __inline__ unsigned short +static inline unsigned short actcapi_nextsmsg(act2000_card *card) { unsigned long flags; diff --git a/trunk/drivers/isdn/sc/command.c b/trunk/drivers/isdn/sc/command.c index 19f2fcf0ae4a..b4b24335f716 100644 --- a/trunk/drivers/isdn/sc/command.c +++ b/trunk/drivers/isdn/sc/command.c @@ -43,7 +43,6 @@ extern int send_and_receive(int, unsigned int, unsigned char, unsigned char, RspMessage *, int); extern int sendmessage(int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int *); -extern inline void pullphone(char *, char *); #ifdef DEBUG /*