aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/s390/char/keyboard.h4
-rw-r--r--drivers/s390/cio/qdio.h8
-rw-r--r--drivers/s390/net/fsm.h6
-rw-r--r--drivers/s390/s390mach.h2
4 files changed, 10 insertions, 10 deletions
diff --git a/drivers/s390/char/keyboard.h b/drivers/s390/char/keyboard.h
index 3b4da5a9cf79..f7bf45c6bf0d 100644
--- a/drivers/s390/char/keyboard.h
+++ b/drivers/s390/char/keyboard.h
@@ -41,14 +41,14 @@ int kbd_ioctl(struct kbd_data *, struct file *, unsigned int, unsigned long);
41/* 41/*
42 * Helper Functions. 42 * Helper Functions.
43 */ 43 */
44extern inline void 44static inline void
45kbd_put_queue(struct tty_struct *tty, int ch) 45kbd_put_queue(struct tty_struct *tty, int ch)
46{ 46{
47 tty_insert_flip_char(tty, ch, 0); 47 tty_insert_flip_char(tty, ch, 0);
48 tty_schedule_flip(tty); 48 tty_schedule_flip(tty);
49} 49}
50 50
51extern inline void 51static inline void
52kbd_puts_queue(struct tty_struct *tty, char *cp) 52kbd_puts_queue(struct tty_struct *tty, char *cp)
53{ 53{
54 while (*cp) 54 while (*cp)
diff --git a/drivers/s390/cio/qdio.h b/drivers/s390/cio/qdio.h
index 6b8aa6a852be..328e31cc6854 100644
--- a/drivers/s390/cio/qdio.h
+++ b/drivers/s390/cio/qdio.h
@@ -265,7 +265,7 @@ QDIO_PRINT_##importance(header "%02x %02x %02x %02x %02x %02x %02x %02x " \
265/* 265/*
266 * Some instructions as assembly 266 * Some instructions as assembly
267 */ 267 */
268extern __inline__ int 268static inline int
269do_siga_sync(unsigned int irq, unsigned int mask1, unsigned int mask2) 269do_siga_sync(unsigned int irq, unsigned int mask1, unsigned int mask2)
270{ 270{
271 int cc; 271 int cc;
@@ -300,7 +300,7 @@ do_siga_sync(unsigned int irq, unsigned int mask1, unsigned int mask2)
300 return cc; 300 return cc;
301} 301}
302 302
303extern __inline__ int 303static inline int
304do_siga_input(unsigned int irq, unsigned int mask) 304do_siga_input(unsigned int irq, unsigned int mask)
305{ 305{
306 int cc; 306 int cc;
@@ -334,7 +334,7 @@ do_siga_input(unsigned int irq, unsigned int mask)
334 return cc; 334 return cc;
335} 335}
336 336
337extern __inline__ int 337static inline int
338do_siga_output(unsigned long irq, unsigned long mask, __u32 *bb) 338do_siga_output(unsigned long irq, unsigned long mask, __u32 *bb)
339{ 339{
340 int cc; 340 int cc;
@@ -401,7 +401,7 @@ do_siga_output(unsigned long irq, unsigned long mask, __u32 *bb)
401 return cc; 401 return cc;
402} 402}
403 403
404extern __inline__ unsigned long 404static inline unsigned long
405do_clear_global_summary(void) 405do_clear_global_summary(void)
406{ 406{
407 407
diff --git a/drivers/s390/net/fsm.h b/drivers/s390/net/fsm.h
index 1b8a7e7c34f3..5b98253be7aa 100644
--- a/drivers/s390/net/fsm.h
+++ b/drivers/s390/net/fsm.h
@@ -140,7 +140,7 @@ fsm_record_history(fsm_instance *fi, int state, int event);
140 * 1 if current state or event is out of range 140 * 1 if current state or event is out of range
141 * !0 if state and event in range, but no action defined. 141 * !0 if state and event in range, but no action defined.
142 */ 142 */
143extern __inline__ int 143static inline int
144fsm_event(fsm_instance *fi, int event, void *arg) 144fsm_event(fsm_instance *fi, int event, void *arg)
145{ 145{
146 fsm_function_t r; 146 fsm_function_t r;
@@ -188,7 +188,7 @@ fsm_event(fsm_instance *fi, int event, void *arg)
188 * @param fi Pointer to FSM 188 * @param fi Pointer to FSM
189 * @param state The new state for this FSM. 189 * @param state The new state for this FSM.
190 */ 190 */
191extern __inline__ void 191static inline void
192fsm_newstate(fsm_instance *fi, int newstate) 192fsm_newstate(fsm_instance *fi, int newstate)
193{ 193{
194 atomic_set(&fi->state,newstate); 194 atomic_set(&fi->state,newstate);
@@ -208,7 +208,7 @@ fsm_newstate(fsm_instance *fi, int newstate)
208 * 208 *
209 * @return The current state of the FSM. 209 * @return The current state of the FSM.
210 */ 210 */
211extern __inline__ int 211static inline int
212fsm_getstate(fsm_instance *fi) 212fsm_getstate(fsm_instance *fi)
213{ 213{
214 return atomic_read(&fi->state); 214 return atomic_read(&fi->state);
diff --git a/drivers/s390/s390mach.h b/drivers/s390/s390mach.h
index 4eaa70179182..d9ea7ed2e46e 100644
--- a/drivers/s390/s390mach.h
+++ b/drivers/s390/s390mach.h
@@ -88,7 +88,7 @@ struct crw {
88#define CRW_ERC_PERRI 0x07 /* perm. error, facility init */ 88#define CRW_ERC_PERRI 0x07 /* perm. error, facility init */
89#define CRW_ERC_PMOD 0x08 /* installed parameters modified */ 89#define CRW_ERC_PMOD 0x08 /* installed parameters modified */
90 90
91extern __inline__ int stcrw(struct crw *pcrw ) 91static inline int stcrw(struct crw *pcrw )
92{ 92{
93 int ccode; 93 int ccode;
94 94