IPMI patch for current bitkeeper (CVS, really)

PATCH Corey Minyard 1 participant 1 message May 24, 2003 IPMI

Share & tools

Corey Minyard

author

2003-05-24 04:21 UTC #0 lore raw

A patch is attached relative to what came out of the bitkeeper-cvs converter, primarily to clean up some things in IPMI.

It consists of:

* little cleanups to make the spacing consistent
* modifications to the watchdog so it starts the first time you hit it, not the second.
* Fix for returning the proper value when starting the sequence number timer.
* Fix a parameter name in the watchdog.

Linus, please apply.

Thanks,

-Corey

Index: linux-2.5/drivers/char/ipmi/ipmi_kcs_intf.c
===================================================================
RCS file: /home/cvs/linux-2.5/drivers/char/ipmi/ipmi_kcs_intf.c,v retrieving revision 1.8

drivers/char/ipmi/ipmi_kcs_intf.c +0 ~~-14~~

diff -u -r1.8 ipmi_kcs_intf.c
@@ -629,20 +629,6 @@
 	atomic_set(&kcs_info->req_events, 1);
 }
 
-#if 0
-static int new_user(void *send_info)
-{
-	if (!try_module_get(THIS_MODULE))
-		return -EBUSY;
-	return 0;
-}
-
-static void user_left(void *send_info)
-{
-	module_put(THIS_MODULE);
-}
-#endif
-
 static int initialized = 0;
 
 /* Must be called with interrupts off and with the kcs_lock held. */

Index: linux-2.5/drivers/char/ipmi/ipmi_msghandler.c
===================================================================
RCS file: /home/cvs/linux-2.5/drivers/char/ipmi/ipmi_msghandler.c,v retrieving revision 1.6

drivers/char/ipmi/ipmi_msghandler.c +4 -3

diff -u -r1.6 ipmi_msghandler.c
@@ -175,7 +175,7 @@
 ipmi_register_all_cmd_rcvr(ipmi_user_t user)
 {
 	unsigned long flags;
-	int rv = -EBUSY;
+	int           rv = -EBUSY;
 
 	write_lock_irqsave(&(user->intf->users_lock), flags);
 	write_lock(&(user->intf->cmd_rcvr_lock));

@@ -194,7 +194,7 @@
 ipmi_unregister_all_cmd_rcvr(ipmi_user_t user)
 {
 	unsigned long flags;
-	int rv = -EINVAL;
+	int           rv = -EINVAL;
 
 	write_lock_irqsave(&(user->intf->users_lock), flags);
 	write_lock(&(user->intf->cmd_rcvr_lock));

@@ -431,6 +431,7 @@
 	{
 		struct seq_table *ent = &(intf->seq_table[seq]);
 		ent->timeout = ent->orig_timeout;
+		rv = 0;
 	}
 	spin_unlock_irqrestore(&(intf->seq_lock), flags);

@@ -1023,7 +1024,7 @@
 	int              rv;
 	ipmi_smi_t       new_intf;
 	struct list_head *entry;
-	unsigned long     flags;
+	unsigned long    flags;
 
 
 	/* Make sure the driver is actually initialized, this handles

Index: linux-2.5/drivers/char/ipmi/ipmi_watchdog.c
===================================================================
RCS file: /home/cvs/linux-2.5/drivers/char/ipmi/ipmi_watchdog.c,v retrieving revision 1.3

drivers/char/ipmi/ipmi_watchdog.c +43 ~~-27~~

187 lines not on this page · raw message