diff options
Diffstat (limited to 'drivers/s390/net')
-rw-r--r-- | drivers/s390/net/claw.c | 1 | ||||
-rw-r--r-- | drivers/s390/net/fsm.h | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c index 1a1c3decea72..6b63d21612ec 100644 --- a/drivers/s390/net/claw.c +++ b/drivers/s390/net/claw.c | |||
@@ -88,7 +88,6 @@ | |||
88 | #include <linux/tcp.h> | 88 | #include <linux/tcp.h> |
89 | #include <linux/timer.h> | 89 | #include <linux/timer.h> |
90 | #include <linux/types.h> | 90 | #include <linux/types.h> |
91 | #include <linux/version.h> | ||
92 | 91 | ||
93 | #include "cu3088.h" | 92 | #include "cu3088.h" |
94 | #include "claw.h" | 93 | #include "claw.h" |
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 | */ |
143 | extern __inline__ int | 143 | static inline int |
144 | fsm_event(fsm_instance *fi, int event, void *arg) | 144 | fsm_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 | */ |
191 | extern __inline__ void | 191 | static inline void |
192 | fsm_newstate(fsm_instance *fi, int newstate) | 192 | fsm_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 | */ |
211 | extern __inline__ int | 211 | static inline int |
212 | fsm_getstate(fsm_instance *fi) | 212 | fsm_getstate(fsm_instance *fi) |
213 | { | 213 | { |
214 | return atomic_read(&fi->state); | 214 | return atomic_read(&fi->state); |