diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/ipmi/ipmi_bt_sm.c | 3 | ||||
-rw-r--r-- | drivers/char/ipmi/ipmi_devintf.c | 7 | ||||
-rw-r--r-- | drivers/char/ipmi/ipmi_kcs_sm.c | 3 | ||||
-rw-r--r-- | drivers/char/ipmi/ipmi_msghandler.c | 8 | ||||
-rw-r--r-- | drivers/char/ipmi/ipmi_poweroff.c | 6 | ||||
-rw-r--r-- | drivers/char/ipmi/ipmi_si_intf.c | 14 | ||||
-rw-r--r-- | drivers/char/ipmi/ipmi_smic_sm.c | 3 | ||||
-rw-r--r-- | drivers/char/ipmi/ipmi_watchdog.c | 9 |
8 files changed, 19 insertions, 34 deletions
diff --git a/drivers/char/ipmi/ipmi_bt_sm.c b/drivers/char/ipmi/ipmi_bt_sm.c index 5ce9c6269033..64c9afa50c13 100644 --- a/drivers/char/ipmi/ipmi_bt_sm.c +++ b/drivers/char/ipmi/ipmi_bt_sm.c | |||
@@ -31,8 +31,6 @@ | |||
31 | #include <linux/ipmi_msgdefs.h> /* for completion codes */ | 31 | #include <linux/ipmi_msgdefs.h> /* for completion codes */ |
32 | #include "ipmi_si_sm.h" | 32 | #include "ipmi_si_sm.h" |
33 | 33 | ||
34 | #define IPMI_BT_VERSION "v33" | ||
35 | |||
36 | static int bt_debug = 0x00; /* Production value 0, see following flags */ | 34 | static int bt_debug = 0x00; /* Production value 0, see following flags */ |
37 | 35 | ||
38 | #define BT_DEBUG_ENABLE 1 | 36 | #define BT_DEBUG_ENABLE 1 |
@@ -501,7 +499,6 @@ static int bt_size(void) | |||
501 | 499 | ||
502 | struct si_sm_handlers bt_smi_handlers = | 500 | struct si_sm_handlers bt_smi_handlers = |
503 | { | 501 | { |
504 | .version = IPMI_BT_VERSION, | ||
505 | .init_data = bt_init_data, | 502 | .init_data = bt_init_data, |
506 | .start_transaction = bt_start_transaction, | 503 | .start_transaction = bt_start_transaction, |
507 | .get_result = bt_get_result, | 504 | .get_result = bt_get_result, |
diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c index 5571e92c520f..883ac4352be4 100644 --- a/drivers/char/ipmi/ipmi_devintf.c +++ b/drivers/char/ipmi/ipmi_devintf.c | |||
@@ -47,8 +47,6 @@ | |||
47 | #include <linux/device.h> | 47 | #include <linux/device.h> |
48 | #include <linux/compat.h> | 48 | #include <linux/compat.h> |
49 | 49 | ||
50 | #define IPMI_DEVINTF_VERSION "v33" | ||
51 | |||
52 | struct ipmi_file_private | 50 | struct ipmi_file_private |
53 | { | 51 | { |
54 | ipmi_user_t user; | 52 | ipmi_user_t user; |
@@ -822,8 +820,7 @@ static __init int init_ipmi_devintf(void) | |||
822 | if (ipmi_major < 0) | 820 | if (ipmi_major < 0) |
823 | return -EINVAL; | 821 | return -EINVAL; |
824 | 822 | ||
825 | printk(KERN_INFO "ipmi device interface version " | 823 | printk(KERN_INFO "ipmi device interface\n"); |
826 | IPMI_DEVINTF_VERSION "\n"); | ||
827 | 824 | ||
828 | ipmi_class = class_create(THIS_MODULE, "ipmi"); | 825 | ipmi_class = class_create(THIS_MODULE, "ipmi"); |
829 | if (IS_ERR(ipmi_class)) { | 826 | if (IS_ERR(ipmi_class)) { |
@@ -866,3 +863,5 @@ static __exit void cleanup_ipmi(void) | |||
866 | module_exit(cleanup_ipmi); | 863 | module_exit(cleanup_ipmi); |
867 | 864 | ||
868 | MODULE_LICENSE("GPL"); | 865 | MODULE_LICENSE("GPL"); |
866 | MODULE_AUTHOR("Corey Minyard <minyard@mvista.com>"); | ||
867 | MODULE_DESCRIPTION("Linux device interface for the IPMI message handler."); | ||
diff --git a/drivers/char/ipmi/ipmi_kcs_sm.c b/drivers/char/ipmi/ipmi_kcs_sm.c index 48cce24329be..d21853a594a3 100644 --- a/drivers/char/ipmi/ipmi_kcs_sm.c +++ b/drivers/char/ipmi/ipmi_kcs_sm.c | |||
@@ -42,8 +42,6 @@ | |||
42 | #include <linux/ipmi_msgdefs.h> /* for completion codes */ | 42 | #include <linux/ipmi_msgdefs.h> /* for completion codes */ |
43 | #include "ipmi_si_sm.h" | 43 | #include "ipmi_si_sm.h" |
44 | 44 | ||
45 | #define IPMI_KCS_VERSION "v33" | ||
46 | |||
47 | /* Set this if you want a printout of why the state machine was hosed | 45 | /* Set this if you want a printout of why the state machine was hosed |
48 | when it gets hosed. */ | 46 | when it gets hosed. */ |
49 | #define DEBUG_HOSED_REASON | 47 | #define DEBUG_HOSED_REASON |
@@ -489,7 +487,6 @@ static void kcs_cleanup(struct si_sm_data *kcs) | |||
489 | 487 | ||
490 | struct si_sm_handlers kcs_smi_handlers = | 488 | struct si_sm_handlers kcs_smi_handlers = |
491 | { | 489 | { |
492 | .version = IPMI_KCS_VERSION, | ||
493 | .init_data = init_kcs_data, | 490 | .init_data = init_kcs_data, |
494 | .start_transaction = start_kcs_transaction, | 491 | .start_transaction = start_kcs_transaction, |
495 | .get_result = get_kcs_result, | 492 | .get_result = get_kcs_result, |
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c index 84d477c6f925..05293d0e6692 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c | |||
@@ -47,7 +47,8 @@ | |||
47 | #include <linux/proc_fs.h> | 47 | #include <linux/proc_fs.h> |
48 | 48 | ||
49 | #define PFX "IPMI message handler: " | 49 | #define PFX "IPMI message handler: " |
50 | #define IPMI_MSGHANDLER_VERSION "v33" | 50 | |
51 | #define IPMI_DRIVER_VERSION "36.0" | ||
51 | 52 | ||
52 | static struct ipmi_recv_msg *ipmi_alloc_recv_msg(void); | 53 | static struct ipmi_recv_msg *ipmi_alloc_recv_msg(void); |
53 | static int ipmi_init_msghandler(void); | 54 | static int ipmi_init_msghandler(void); |
@@ -3150,7 +3151,7 @@ static int ipmi_init_msghandler(void) | |||
3150 | return 0; | 3151 | return 0; |
3151 | 3152 | ||
3152 | printk(KERN_INFO "ipmi message handler version " | 3153 | printk(KERN_INFO "ipmi message handler version " |
3153 | IPMI_MSGHANDLER_VERSION "\n"); | 3154 | IPMI_DRIVER_VERSION "\n"); |
3154 | 3155 | ||
3155 | for (i=0; i<MAX_IPMI_INTERFACES; i++) { | 3156 | for (i=0; i<MAX_IPMI_INTERFACES; i++) { |
3156 | ipmi_interfaces[i] = NULL; | 3157 | ipmi_interfaces[i] = NULL; |
@@ -3222,6 +3223,9 @@ module_exit(cleanup_ipmi); | |||
3222 | 3223 | ||
3223 | module_init(ipmi_init_msghandler_mod); | 3224 | module_init(ipmi_init_msghandler_mod); |
3224 | MODULE_LICENSE("GPL"); | 3225 | MODULE_LICENSE("GPL"); |
3226 | MODULE_AUTHOR("Corey Minyard <minyard@mvista.com>"); | ||
3227 | MODULE_DESCRIPTION("Incoming and outgoing message routing for an IPMI interface."); | ||
3228 | MODULE_VERSION(IPMI_DRIVER_VERSION); | ||
3225 | 3229 | ||
3226 | EXPORT_SYMBOL(ipmi_create_user); | 3230 | EXPORT_SYMBOL(ipmi_create_user); |
3227 | EXPORT_SYMBOL(ipmi_destroy_user); | 3231 | EXPORT_SYMBOL(ipmi_destroy_user); |
diff --git a/drivers/char/ipmi/ipmi_poweroff.c b/drivers/char/ipmi/ipmi_poweroff.c index f951c30236c9..1583329ac2ec 100644 --- a/drivers/char/ipmi/ipmi_poweroff.c +++ b/drivers/char/ipmi/ipmi_poweroff.c | |||
@@ -42,7 +42,6 @@ | |||
42 | #include <linux/ipmi_smi.h> | 42 | #include <linux/ipmi_smi.h> |
43 | 43 | ||
44 | #define PFX "IPMI poweroff: " | 44 | #define PFX "IPMI poweroff: " |
45 | #define IPMI_POWEROFF_VERSION "v33" | ||
46 | 45 | ||
47 | /* Where to we insert our poweroff function? */ | 46 | /* Where to we insert our poweroff function? */ |
48 | extern void (*pm_power_off)(void); | 47 | extern void (*pm_power_off)(void); |
@@ -582,8 +581,7 @@ static int ipmi_poweroff_init (void) | |||
582 | struct proc_dir_entry *file; | 581 | struct proc_dir_entry *file; |
583 | 582 | ||
584 | printk ("Copyright (C) 2004 MontaVista Software -" | 583 | printk ("Copyright (C) 2004 MontaVista Software -" |
585 | " IPMI Powerdown via sys_reboot version " | 584 | " IPMI Powerdown via sys_reboot.\n"); |
586 | IPMI_POWEROFF_VERSION ".\n"); | ||
587 | 585 | ||
588 | switch (poweroff_control) { | 586 | switch (poweroff_control) { |
589 | case IPMI_CHASSIS_POWER_CYCLE: | 587 | case IPMI_CHASSIS_POWER_CYCLE: |
@@ -642,3 +640,5 @@ module_exit(ipmi_poweroff_cleanup); | |||
642 | 640 | ||
643 | module_init(ipmi_poweroff_init); | 641 | module_init(ipmi_poweroff_init); |
644 | MODULE_LICENSE("GPL"); | 642 | MODULE_LICENSE("GPL"); |
643 | MODULE_AUTHOR("Corey Minyard <minyard@mvista.com>"); | ||
644 | MODULE_DESCRIPTION("IPMI Poweroff extension to sys_reboot"); | ||
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 4fb36d4142fb..b43172aee4c6 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c | |||
@@ -77,8 +77,6 @@ static inline void add_usec_to_timer(struct timer_list *t, long v) | |||
77 | #include <linux/init.h> | 77 | #include <linux/init.h> |
78 | #include <linux/dmi.h> | 78 | #include <linux/dmi.h> |
79 | 79 | ||
80 | #define IPMI_SI_VERSION "v33" | ||
81 | |||
82 | /* Measure times between events in the driver. */ | 80 | /* Measure times between events in the driver. */ |
83 | #undef DEBUG_TIMING | 81 | #undef DEBUG_TIMING |
84 | 82 | ||
@@ -2310,15 +2308,7 @@ static __init int init_ipmi_si(void) | |||
2310 | } | 2308 | } |
2311 | } | 2309 | } |
2312 | 2310 | ||
2313 | printk(KERN_INFO "IPMI System Interface driver version " | 2311 | printk(KERN_INFO "IPMI System Interface driver.\n"); |
2314 | IPMI_SI_VERSION); | ||
2315 | if (kcs_smi_handlers.version) | ||
2316 | printk(", KCS version %s", kcs_smi_handlers.version); | ||
2317 | if (smic_smi_handlers.version) | ||
2318 | printk(", SMIC version %s", smic_smi_handlers.version); | ||
2319 | if (bt_smi_handlers.version) | ||
2320 | printk(", BT version %s", bt_smi_handlers.version); | ||
2321 | printk("\n"); | ||
2322 | 2312 | ||
2323 | #ifdef CONFIG_X86 | 2313 | #ifdef CONFIG_X86 |
2324 | dmi_find_bmc(); | 2314 | dmi_find_bmc(); |
@@ -2430,3 +2420,5 @@ static __exit void cleanup_ipmi_si(void) | |||
2430 | module_exit(cleanup_ipmi_si); | 2420 | module_exit(cleanup_ipmi_si); |
2431 | 2421 | ||
2432 | MODULE_LICENSE("GPL"); | 2422 | MODULE_LICENSE("GPL"); |
2423 | MODULE_AUTHOR("Corey Minyard <minyard@mvista.com>"); | ||
2424 | MODULE_DESCRIPTION("Interface to the IPMI driver for the KCS, SMIC, and BT system interfaces."); | ||
diff --git a/drivers/char/ipmi/ipmi_smic_sm.c b/drivers/char/ipmi/ipmi_smic_sm.c index ae18747e670b..add2aa2732f0 100644 --- a/drivers/char/ipmi/ipmi_smic_sm.c +++ b/drivers/char/ipmi/ipmi_smic_sm.c | |||
@@ -46,8 +46,6 @@ | |||
46 | #include <linux/ipmi_msgdefs.h> /* for completion codes */ | 46 | #include <linux/ipmi_msgdefs.h> /* for completion codes */ |
47 | #include "ipmi_si_sm.h" | 47 | #include "ipmi_si_sm.h" |
48 | 48 | ||
49 | #define IPMI_SMIC_VERSION "v33" | ||
50 | |||
51 | /* smic_debug is a bit-field | 49 | /* smic_debug is a bit-field |
52 | * SMIC_DEBUG_ENABLE - turned on for now | 50 | * SMIC_DEBUG_ENABLE - turned on for now |
53 | * SMIC_DEBUG_MSG - commands and their responses | 51 | * SMIC_DEBUG_MSG - commands and their responses |
@@ -588,7 +586,6 @@ static int smic_size(void) | |||
588 | 586 | ||
589 | struct si_sm_handlers smic_smi_handlers = | 587 | struct si_sm_handlers smic_smi_handlers = |
590 | { | 588 | { |
591 | .version = IPMI_SMIC_VERSION, | ||
592 | .init_data = init_smic_data, | 589 | .init_data = init_smic_data, |
593 | .start_transaction = start_smic_transaction, | 590 | .start_transaction = start_smic_transaction, |
594 | .get_result = smic_get_result, | 591 | .get_result = smic_get_result, |
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c index 82d564342084..77ece1f218cd 100644 --- a/drivers/char/ipmi/ipmi_watchdog.c +++ b/drivers/char/ipmi/ipmi_watchdog.c | |||
@@ -53,8 +53,6 @@ | |||
53 | 53 | ||
54 | #define PFX "IPMI Watchdog: " | 54 | #define PFX "IPMI Watchdog: " |
55 | 55 | ||
56 | #define IPMI_WATCHDOG_VERSION "v33" | ||
57 | |||
58 | /* | 56 | /* |
59 | * The IPMI command/response information for the watchdog timer. | 57 | * The IPMI command/response information for the watchdog timer. |
60 | */ | 58 | */ |
@@ -928,9 +926,6 @@ static int __init ipmi_wdog_init(void) | |||
928 | { | 926 | { |
929 | int rv; | 927 | int rv; |
930 | 928 | ||
931 | printk(KERN_INFO PFX "driver version " | ||
932 | IPMI_WATCHDOG_VERSION "\n"); | ||
933 | |||
934 | if (strcmp(action, "reset") == 0) { | 929 | if (strcmp(action, "reset") == 0) { |
935 | action_val = WDOG_TIMEOUT_RESET; | 930 | action_val = WDOG_TIMEOUT_RESET; |
936 | } else if (strcmp(action, "none") == 0) { | 931 | } else if (strcmp(action, "none") == 0) { |
@@ -1015,6 +1010,8 @@ static int __init ipmi_wdog_init(void) | |||
1015 | register_reboot_notifier(&wdog_reboot_notifier); | 1010 | register_reboot_notifier(&wdog_reboot_notifier); |
1016 | notifier_chain_register(&panic_notifier_list, &wdog_panic_notifier); | 1011 | notifier_chain_register(&panic_notifier_list, &wdog_panic_notifier); |
1017 | 1012 | ||
1013 | printk(KERN_INFO PFX "driver initialized\n"); | ||
1014 | |||
1018 | return 0; | 1015 | return 0; |
1019 | } | 1016 | } |
1020 | 1017 | ||
@@ -1066,3 +1063,5 @@ static void __exit ipmi_wdog_exit(void) | |||
1066 | module_exit(ipmi_wdog_exit); | 1063 | module_exit(ipmi_wdog_exit); |
1067 | module_init(ipmi_wdog_init); | 1064 | module_init(ipmi_wdog_init); |
1068 | MODULE_LICENSE("GPL"); | 1065 | MODULE_LICENSE("GPL"); |
1066 | MODULE_AUTHOR("Corey Minyard <minyard@mvista.com>"); | ||
1067 | MODULE_DESCRIPTION("watchdog timer based upon the IPMI interface."); | ||