From: Peter Tiedemann <ptiedem@xxxxxxxxxx>
move fsm_action_nop to fsm.h to avoid duplicate definitions in
both drivers ctc and netiucv.
Signed-off-by: Peter Tiedemann <ptiedem@xxxxxxxxxx>
Signed-off-by: Ursula Braun <braunu@xxxxxxxxxx>
---
drivers/s390/net/ctcmain.c | 8 --------
drivers/s390/net/fsm.h | 8 ++++++++
drivers/s390/net/netiucv.c | 8 +-------
3 files changed, 9 insertions(+), 15 deletions(-)
Index: linux-2.6-uschi/drivers/s390/net/fsm.h
===================================================================
--- linux-2.6-uschi.orig/drivers/s390/net/fsm.h
+++ linux-2.6-uschi/drivers/s390/net/fsm.h
@@ -260,4 +260,12 @@ extern int fsm_addtimer(fsm_timer *timer
*/
extern void fsm_modtimer(fsm_timer *timer, int millisec, int event, void *arg);
+/**
+ * NOP action for statemachines
+ */
+static inline void
+fsm_action_nop(fsm_instance *fi, int event, void *arg)
+{
+}
+
#endif /* _FSM_H_ */
Index: linux-2.6-uschi/drivers/s390/net/netiucv.c
===================================================================
--- linux-2.6-uschi.orig/drivers/s390/net/netiucv.c
+++ linux-2.6-uschi/drivers/s390/net/netiucv.c
@@ -137,6 +137,7 @@ PRINT_##importance(header "%02x %02x %02
#define PRINTK_HEADER " iucv: " /* for debugging */
static struct device_driver netiucv_driver = {
+ .owner = THIS_MODULE,
.name = "netiucv",
.bus = &iucv_bus,
};
@@ -571,13 +572,6 @@ static void netiucv_callback_connres(str
fsm_event(conn->fsm, CONN_EVENT_CONN_RES, conn);
}
-/**
- * Dummy NOP action for all statemachines
- */
-static void fsm_action_nop(fsm_instance *fi, int event, void *arg)
-{
-}
-
/*
* Actions of the connection statemachine
*/
Index: linux-2.6-uschi/drivers/s390/net/ctcmain.c
===================================================================
--- linux-2.6-uschi.orig/drivers/s390/net/ctcmain.c
+++ linux-2.6-uschi/drivers/s390/net/ctcmain.c
@@ -644,14 +644,6 @@ ctc_checkalloc_buffer(struct channel *ch
}
/**
- * Dummy NOP action for statemachines
- */
-static void
-fsm_action_nop(fsm_instance * fi, int event, void *arg)
-{
-}
-
-/**
* Actions for channel - statemachines.
*****************************************************************************/
--
-
To unsubscribe from this list: send the line "unsubscribe linux-s390" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
