diff options
author | Adrian Bunk <bunk@stusta.de> | 2005-08-16 23:45:45 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2005-08-29 19:01:43 -0400 |
commit | bf73d1c5d726ac717755efc7e15d2a86dd383448 (patch) | |
tree | 50d1038ea7c010c193f7f1d40d093a8efbf259c2 | |
parent | 4c6ea29d82e0d1b9b37e6b879e0a7fd6c409333d (diff) |
[IRDA]: Possible cleanups.
This patch contains the following possible cleanups:
- make the following needlessly global function static:
- irnet/irnet_ppp.c: irnet_init
- remove the following unneeded EXPORT_SYMBOL's:
- irlmp.c: sysctl_discovery_timeout
- irlmp.c: irlmp_reasons
- irlmp.c: irlmp_dup
- irqueue.c: hashbin_find_next
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/irda/irlmp.c | 3 | ||||
-rw-r--r-- | net/irda/irnet/irnet.h | 3 | ||||
-rw-r--r-- | net/irda/irnet/irnet_ppp.c | 2 | ||||
-rw-r--r-- | net/irda/irqueue.c | 1 |
4 files changed, 1 insertions, 8 deletions
diff --git a/net/irda/irlmp.c b/net/irda/irlmp.c index 7a4a4d7fbe66..c19e9ce05a3a 100644 --- a/net/irda/irlmp.c +++ b/net/irda/irlmp.c | |||
@@ -53,7 +53,6 @@ struct irlmp_cb *irlmp = NULL; | |||
53 | /* These can be altered by the sysctl interface */ | 53 | /* These can be altered by the sysctl interface */ |
54 | int sysctl_discovery = 0; | 54 | int sysctl_discovery = 0; |
55 | int sysctl_discovery_timeout = 3; /* 3 seconds by default */ | 55 | int sysctl_discovery_timeout = 3; /* 3 seconds by default */ |
56 | EXPORT_SYMBOL(sysctl_discovery_timeout); | ||
57 | int sysctl_discovery_slots = 6; /* 6 slots by default */ | 56 | int sysctl_discovery_slots = 6; /* 6 slots by default */ |
58 | int sysctl_lap_keepalive_time = LM_IDLE_TIMEOUT * 1000 / HZ; | 57 | int sysctl_lap_keepalive_time = LM_IDLE_TIMEOUT * 1000 / HZ; |
59 | char sysctl_devname[65]; | 58 | char sysctl_devname[65]; |
@@ -67,7 +66,6 @@ const char *irlmp_reasons[] = { | |||
67 | "LM_INIT_DISCONNECT", | 66 | "LM_INIT_DISCONNECT", |
68 | "ERROR, NOT USED", | 67 | "ERROR, NOT USED", |
69 | }; | 68 | }; |
70 | EXPORT_SYMBOL(irlmp_reasons); | ||
71 | 69 | ||
72 | /* | 70 | /* |
73 | * Function irlmp_init (void) | 71 | * Function irlmp_init (void) |
@@ -675,7 +673,6 @@ struct lsap_cb *irlmp_dup(struct lsap_cb *orig, void *instance) | |||
675 | 673 | ||
676 | return new; | 674 | return new; |
677 | } | 675 | } |
678 | EXPORT_SYMBOL(irlmp_dup); | ||
679 | 676 | ||
680 | /* | 677 | /* |
681 | * Function irlmp_disconnect_request (handle, userdata) | 678 | * Function irlmp_disconnect_request (handle, userdata) |
diff --git a/net/irda/irnet/irnet.h b/net/irda/irnet/irnet.h index 9004f7349a76..b391cb3893d4 100644 --- a/net/irda/irnet/irnet.h +++ b/net/irda/irnet/irnet.h | |||
@@ -517,9 +517,6 @@ extern int | |||
517 | irda_irnet_init(void); /* Initialise IrDA part of IrNET */ | 517 | irda_irnet_init(void); /* Initialise IrDA part of IrNET */ |
518 | extern void | 518 | extern void |
519 | irda_irnet_cleanup(void); /* Teardown IrDA part of IrNET */ | 519 | irda_irnet_cleanup(void); /* Teardown IrDA part of IrNET */ |
520 | /* ---------------------------- MODULE ---------------------------- */ | ||
521 | extern int | ||
522 | irnet_init(void); /* Initialise IrNET module */ | ||
523 | 520 | ||
524 | /**************************** VARIABLES ****************************/ | 521 | /**************************** VARIABLES ****************************/ |
525 | 522 | ||
diff --git a/net/irda/irnet/irnet_ppp.c b/net/irda/irnet/irnet_ppp.c index f8f984bb9922..e53bf9e0053e 100644 --- a/net/irda/irnet/irnet_ppp.c +++ b/net/irda/irnet/irnet_ppp.c | |||
@@ -1107,7 +1107,7 @@ ppp_irnet_cleanup(void) | |||
1107 | /* | 1107 | /* |
1108 | * Module main entry point | 1108 | * Module main entry point |
1109 | */ | 1109 | */ |
1110 | int __init | 1110 | static int __init |
1111 | irnet_init(void) | 1111 | irnet_init(void) |
1112 | { | 1112 | { |
1113 | int err; | 1113 | int err; |
diff --git a/net/irda/irqueue.c b/net/irda/irqueue.c index b0dd3ea35999..1ba8c7106639 100644 --- a/net/irda/irqueue.c +++ b/net/irda/irqueue.c | |||
@@ -822,7 +822,6 @@ void* hashbin_find_next( hashbin_t* hashbin, long hashv, const char* name, | |||
822 | 822 | ||
823 | return entry; | 823 | return entry; |
824 | } | 824 | } |
825 | EXPORT_SYMBOL(hashbin_find_next); | ||
826 | 825 | ||
827 | /* | 826 | /* |
828 | * Function hashbin_get_first (hashbin) | 827 | * Function hashbin_get_first (hashbin) |