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

Commit 191cc414 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Corey Minyard
Browse files

ipmi: avoid gcc warning 



A new harmless warning has come up on ARM builds with gcc-4.9:

drivers/char/ipmi/ipmi_msghandler.c: In function 'smi_send.isra.11':
include/linux/spinlock.h:372:95: warning: 'flags' may be used uninitialized in this function [-Wmaybe-uninitialized]
  raw_spin_unlock_irqrestore(&lock->rlock, flags);
                                                                                               ^
drivers/char/ipmi/ipmi_msghandler.c:1490:16: note: 'flags' was declared here
  unsigned long flags;
                ^

This could be worked around by initializing the 'flags' variable, but it
seems better to rework the code to avoid this.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: 7ea0ed2b ("ipmi: Make the message handler easier to use for SMI interfaces")
Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
parent 48862ea2

drivers/char/ipmi/ipmi_msghandler.c

+21 −8
Original line number Diff line number Diff line
@@ -1483,14 +1483,10 @@ static inline void format_lan_msg(struct ipmi_smi_msg *smi_msg, 
	smi_msg->msgid = msgid;

}



static void smi_send(ipmi_smi_t intf, struct ipmi_smi_handlers *handlers,

		     struct ipmi_smi_msg *smi_msg, int priority)

static struct ipmi_smi_msg *smi_add_send_msg(ipmi_smi_t intf,

					     struct ipmi_smi_msg *smi_msg,

					     int priority)

{

	int run_to_completion = intf->run_to_completion;

	unsigned long flags;



	if (!run_to_completion)

		spin_lock_irqsave(&intf->xmit_msgs_lock, flags);

	if (intf->curr_msg) {

		if (priority > 0)

			list_add_tail(&smi_msg->link, &intf->hp_xmit_msgs);
@@ -1500,8 +1496,25 @@ static void smi_send(ipmi_smi_t intf, struct ipmi_smi_handlers *handlers, 
	} else {

		intf->curr_msg = smi_msg;

	}

	if (!run_to_completion)



	return smi_msg;

}





static void smi_send(ipmi_smi_t intf, struct ipmi_smi_handlers *handlers,

		     struct ipmi_smi_msg *smi_msg, int priority)

{

	int run_to_completion = intf->run_to_completion;



	if (run_to_completion) {

		smi_msg = smi_add_send_msg(intf, smi_msg, priority);

	} else {

		unsigned long flags;



		spin_lock_irqsave(&intf->xmit_msgs_lock, flags);

		smi_msg = smi_add_send_msg(intf, smi_msg, priority);

		spin_unlock_irqrestore(&intf->xmit_msgs_lock, flags);

	}



	if (smi_msg)

		handlers->sender(intf->send_info, smi_msg);