Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a3628d5 authored by Corey Minyard's avatar Corey Minyard Committed by Linus Torvalds
Browse files

[PATCH] IPMI: tidy up various things 



Tidy up various coding standard things, mostly removing the space after !,
but also break some long lines and fix a few other spacing inconsistencies.
Also fixes some bad error reporting when deleting an IPMI user.

Signed-off-by: default avatarCorey Minyard <minyard@acm.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 453823ba

drivers/char/ipmi/ipmi_msghandler.c

+25 −23
Original line number Diff line number Diff line
@@ -819,14 +819,13 @@ static void free_user(struct kref *ref) 


int ipmi_destroy_user(ipmi_user_t user)

{

	int              rv = -ENODEV;

	ipmi_smi_t       intf = user->intf;

	int              i;

	unsigned long    flags;

	struct cmd_rcvr  *rcvr;

	struct cmd_rcvr  *rcvrs = NULL;



	user->valid = 1;

	user->valid = 0;



	/* Remove the user from the interface's sequence table. */

	spin_lock_irqsave(&intf->seq_lock, flags);
@@ -871,7 +870,7 @@ int ipmi_destroy_user(ipmi_user_t user) 


	kref_put(&user->refcount, free_user);



	return rv;

	return 0;

}



void ipmi_get_version(ipmi_user_t   user,
@@ -936,7 +935,8 @@ int ipmi_set_gets_events(ipmi_user_t user, int val) 


	if (val) {

		/* Deliver any queued events. */

		list_for_each_entry_safe(msg, msg2, &intf->waiting_events, link) {

		list_for_each_entry_safe(msg, msg2, &intf->waiting_events,

					 link) {

			list_del(&msg->link);

			list_add_tail(&msg->link, &msgs);

		}
@@ -2874,7 +2874,8 @@ static int handle_read_event_rsp(ipmi_smi_t intf, 
		recv_msg = ipmi_alloc_recv_msg();

		if (!recv_msg) {

			rcu_read_unlock();

			list_for_each_entry_safe(recv_msg, recv_msg2, &msgs, link) {

			list_for_each_entry_safe(recv_msg, recv_msg2, &msgs,

						 link) {

				list_del(&recv_msg->link);

				ipmi_free_recv_msg(recv_msg);

			}
@@ -3313,7 +3314,8 @@ static void ipmi_timeout_handler(long timeout_period) 


		/* See if any waiting messages need to be processed. */

		spin_lock_irqsave(&intf->waiting_msgs_lock, flags);

		list_for_each_entry_safe(smi_msg, smi_msg2, &intf->waiting_msgs, link) {

		list_for_each_entry_safe(smi_msg, smi_msg2,

					 &intf->waiting_msgs, link) {

			if (!handle_new_recv_msg(intf, smi_msg)) {

				list_del(&smi_msg->link);

				ipmi_free_smi_msg(smi_msg);

drivers/char/ipmi/ipmi_watchdog.c

+4 −4
Original line number Diff line number Diff line
@@ -790,13 +790,13 @@ static int ipmi_fasync(int fd, struct file *file, int on) 


static int ipmi_close(struct inode *ino, struct file *filep)

{

	if (iminor(ino)==WATCHDOG_MINOR)

	{

	if (iminor(ino) == WATCHDOG_MINOR) {

		if (expect_close == 42) {

			ipmi_watchdog_state = WDOG_TIMEOUT_NONE;

			ipmi_set_timeout(IPMI_SET_TIMEOUT_NO_HB);

		} else {

			printk(KERN_CRIT PFX "Unexpected close, not stopping watchdog!\n");

			printk(KERN_CRIT PFX

			       "Unexpected close, not stopping watchdog!\n");

			ipmi_heartbeat();

		}

		clear_bit(0, &ipmi_wdog_open);

drivers/char/ipmi/ipmi_kcs_sm.c

+4 −4

File changed.

Contains only whitespace changes.

drivers/char/ipmi/ipmi_poweroff.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/char/ipmi/ipmi_si_intf.c

+1 −1

File changed.

Contains only whitespace changes.