diff options
| -rw-r--r-- | drivers/isdn/hysdn/hysdn_defs.h | 2 | ||||
| -rw-r--r-- | drivers/isdn/hysdn/hysdn_init.c | 26 | ||||
| -rw-r--r-- | drivers/isdn/hysdn/hysdn_net.c | 3 | ||||
| -rw-r--r-- | drivers/isdn/hysdn/hysdn_procconf.c | 3 |
4 files changed, 2 insertions, 32 deletions
diff --git a/drivers/isdn/hysdn/hysdn_defs.h b/drivers/isdn/hysdn/hysdn_defs.h index 729df4089385..18b801ad97a4 100644 --- a/drivers/isdn/hysdn/hysdn_defs.h +++ b/drivers/isdn/hysdn/hysdn_defs.h | |||
| @@ -227,7 +227,6 @@ extern hysdn_card *card_root; /* pointer to first card */ | |||
| 227 | /*************************/ | 227 | /*************************/ |
| 228 | /* im/exported functions */ | 228 | /* im/exported functions */ |
| 229 | /*************************/ | 229 | /*************************/ |
| 230 | extern char *hysdn_getrev(const char *); | ||
| 231 | 230 | ||
| 232 | /* hysdn_procconf.c */ | 231 | /* hysdn_procconf.c */ |
| 233 | extern int hysdn_procconf_init(void); /* init proc config filesys */ | 232 | extern int hysdn_procconf_init(void); /* init proc config filesys */ |
| @@ -259,7 +258,6 @@ extern int hysdn_tx_cfgline(hysdn_card *, unsigned char *, | |||
| 259 | 258 | ||
| 260 | /* hysdn_net.c */ | 259 | /* hysdn_net.c */ |
| 261 | extern unsigned int hynet_enable; | 260 | extern unsigned int hynet_enable; |
| 262 | extern char *hysdn_net_revision; | ||
| 263 | extern int hysdn_net_create(hysdn_card *); /* create a new net device */ | 261 | extern int hysdn_net_create(hysdn_card *); /* create a new net device */ |
| 264 | extern int hysdn_net_release(hysdn_card *); /* delete the device */ | 262 | extern int hysdn_net_release(hysdn_card *); /* delete the device */ |
| 265 | extern char *hysdn_net_getname(hysdn_card *); /* get name of net interface */ | 263 | extern char *hysdn_net_getname(hysdn_card *); /* get name of net interface */ |
diff --git a/drivers/isdn/hysdn/hysdn_init.c b/drivers/isdn/hysdn/hysdn_init.c index b7cc5c2f08c6..0ab42ace1692 100644 --- a/drivers/isdn/hysdn/hysdn_init.c +++ b/drivers/isdn/hysdn/hysdn_init.c | |||
| @@ -36,7 +36,6 @@ MODULE_DESCRIPTION("ISDN4Linux: Driver for HYSDN cards"); | |||
| 36 | MODULE_AUTHOR("Werner Cornelius"); | 36 | MODULE_AUTHOR("Werner Cornelius"); |
| 37 | MODULE_LICENSE("GPL"); | 37 | MODULE_LICENSE("GPL"); |
| 38 | 38 | ||
| 39 | static char *hysdn_init_revision = "$Revision: 1.6.6.6 $"; | ||
| 40 | static int cardmax; /* number of found cards */ | 39 | static int cardmax; /* number of found cards */ |
| 41 | hysdn_card *card_root = NULL; /* pointer to first card */ | 40 | hysdn_card *card_root = NULL; /* pointer to first card */ |
| 42 | static hysdn_card *card_last = NULL; /* pointer to first card */ | 41 | static hysdn_card *card_last = NULL; /* pointer to first card */ |
| @@ -49,25 +48,6 @@ static hysdn_card *card_last = NULL; /* pointer to first card */ | |||
| 49 | /* Additionally newer versions may be activated without rebooting. */ | 48 | /* Additionally newer versions may be activated without rebooting. */ |
| 50 | /****************************************************************************/ | 49 | /****************************************************************************/ |
| 51 | 50 | ||
| 52 | /******************************************************/ | ||
| 53 | /* extract revision number from string for log output */ | ||
| 54 | /******************************************************/ | ||
| 55 | char * | ||
| 56 | hysdn_getrev(const char *revision) | ||
| 57 | { | ||
| 58 | char *rev; | ||
| 59 | char *p; | ||
| 60 | |||
| 61 | if ((p = strchr(revision, ':'))) { | ||
| 62 | rev = p + 2; | ||
| 63 | p = strchr(rev, '$'); | ||
| 64 | *--p = 0; | ||
| 65 | } else | ||
| 66 | rev = "???"; | ||
| 67 | return rev; | ||
| 68 | } | ||
| 69 | |||
| 70 | |||
| 71 | /****************************************************************************/ | 51 | /****************************************************************************/ |
| 72 | /* init_module is called once when the module is loaded to do all necessary */ | 52 | /* init_module is called once when the module is loaded to do all necessary */ |
| 73 | /* things like autodetect... */ | 53 | /* things like autodetect... */ |
| @@ -175,13 +155,9 @@ static int hysdn_have_procfs; | |||
| 175 | static int __init | 155 | static int __init |
| 176 | hysdn_init(void) | 156 | hysdn_init(void) |
| 177 | { | 157 | { |
| 178 | char tmp[50]; | ||
| 179 | int rc; | 158 | int rc; |
| 180 | 159 | ||
| 181 | strcpy(tmp, hysdn_init_revision); | 160 | printk(KERN_NOTICE "HYSDN: module loaded\n"); |
| 182 | printk(KERN_NOTICE "HYSDN: module Rev: %s loaded\n", hysdn_getrev(tmp)); | ||
| 183 | strcpy(tmp, hysdn_net_revision); | ||
| 184 | printk(KERN_NOTICE "HYSDN: network interface Rev: %s \n", hysdn_getrev(tmp)); | ||
| 185 | 161 | ||
| 186 | rc = pci_register_driver(&hysdn_pci_driver); | 162 | rc = pci_register_driver(&hysdn_pci_driver); |
| 187 | if (rc) | 163 | if (rc) |
diff --git a/drivers/isdn/hysdn/hysdn_net.c b/drivers/isdn/hysdn/hysdn_net.c index feec8d89d719..11f2cce26005 100644 --- a/drivers/isdn/hysdn/hysdn_net.c +++ b/drivers/isdn/hysdn/hysdn_net.c | |||
| @@ -26,9 +26,6 @@ | |||
| 26 | unsigned int hynet_enable = 0xffffffff; | 26 | unsigned int hynet_enable = 0xffffffff; |
| 27 | module_param(hynet_enable, uint, 0); | 27 | module_param(hynet_enable, uint, 0); |
| 28 | 28 | ||
| 29 | /* store the actual version for log reporting */ | ||
| 30 | char *hysdn_net_revision = "$Revision: 1.8.6.4 $"; | ||
| 31 | |||
| 32 | #define MAX_SKB_BUFFERS 20 /* number of buffers for keeping TX-data */ | 29 | #define MAX_SKB_BUFFERS 20 /* number of buffers for keeping TX-data */ |
| 33 | 30 | ||
| 34 | /****************************************************************************/ | 31 | /****************************************************************************/ |
diff --git a/drivers/isdn/hysdn/hysdn_procconf.c b/drivers/isdn/hysdn/hysdn_procconf.c index 96b3e39c3356..5fe83bd42061 100644 --- a/drivers/isdn/hysdn/hysdn_procconf.c +++ b/drivers/isdn/hysdn/hysdn_procconf.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include "hysdn_defs.h" | 23 | #include "hysdn_defs.h" |
| 24 | 24 | ||
| 25 | static DEFINE_MUTEX(hysdn_conf_mutex); | 25 | static DEFINE_MUTEX(hysdn_conf_mutex); |
| 26 | static char *hysdn_procconf_revision = "$Revision: 1.8.6.4 $"; | ||
| 27 | 26 | ||
| 28 | #define INFO_OUT_LEN 80 /* length of info line including lf */ | 27 | #define INFO_OUT_LEN 80 /* length of info line including lf */ |
| 29 | 28 | ||
| @@ -404,7 +403,7 @@ hysdn_procconf_init(void) | |||
| 404 | card = card->next; /* next entry */ | 403 | card = card->next; /* next entry */ |
| 405 | } | 404 | } |
| 406 | 405 | ||
| 407 | printk(KERN_NOTICE "HYSDN: procfs Rev. %s initialised\n", hysdn_getrev(hysdn_procconf_revision)); | 406 | printk(KERN_NOTICE "HYSDN: procfs initialised\n"); |
| 408 | return (0); | 407 | return (0); |
| 409 | } /* hysdn_procconf_init */ | 408 | } /* hysdn_procconf_init */ |
| 410 | 409 | ||
