2003-06-20 21:52:34

by Bob Miller

[permalink] [raw]
Subject: [PATCH TRIVIAL 2.5.72] Remove check_region() from ipmi_kcs_intf.c

This patch removes the defunct check_*_region() calls. The init_one_kcs()
call does the heavy lifting of getting the region via calls to the correct
request_*_region() function.

--
Bob Miller Email: [email protected]
Open Source Development Lab Phone: 503.626.2455 Ext. 17

diff -Nru a/drivers/char/ipmi/ipmi_kcs_intf.c b/drivers/char/ipmi/ipmi_kcs_intf.c
--- a/drivers/char/ipmi/ipmi_kcs_intf.c Fri Jun 20 13:57:08 2003
+++ b/drivers/char/ipmi/ipmi_kcs_intf.c Fri Jun 20 13:57:08 2003
@@ -1104,24 +1104,14 @@
if (kcs_trydefaults) {
#ifdef CONFIG_ACPI
if ((physaddr = acpi_find_bmc())) {
- if (!check_mem_region(physaddr, 2)) {
- rv = init_one_kcs(0,
- 0,
- physaddr,
- &(kcs_infos[pos]));
- if (rv == 0)
- pos++;
- }
- }
-#endif
- if (!check_region(DEFAULT_IO_PORT, 2)) {
- rv = init_one_kcs(DEFAULT_IO_PORT,
- 0,
- 0,
- &(kcs_infos[pos]));
+ rv = init_one_kcs(0, 0, physaddr, &(kcs_infos[pos]));
if (rv == 0)
pos++;
}
+#endif
+ rv = init_one_kcs(DEFAULT_IO_PORT, 0, 0, &(kcs_infos[pos]));
+ if (rv == 0)
+ pos++;
}

if (kcs_infos[0] == NULL) {