Commit f214549d authored by Corey Minyard's avatar Corey Minyard
Browse files

ipmi: Add an intializer for ipmi_recv_msg struct 



Don't hand-initialize the struct here, create a macro to initialize it
so new fields added don't get forgotten in places.

Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
parent 9824117d

drivers/char/ipmi/ipmi_poweroff.c

+1 −3
Original line number Diff line number Diff line
@@ -95,9 +95,7 @@ static void dummy_recv_free(struct ipmi_recv_msg *msg) 
	atomic_dec(&dummy_count);

}

static struct ipmi_smi_msg halt_smi_msg = INIT_IPMI_SMI_MSG(dummy_smi_free);

static struct ipmi_recv_msg halt_recv_msg = {

	.done = dummy_recv_free

};

static struct ipmi_recv_msg halt_recv_msg = INIT_IPMI_RECV_MSG(dummy_recv_free);





/*

drivers/char/ipmi/ipmi_watchdog.c

+5 −9
Original line number Diff line number Diff line
@@ -355,9 +355,7 @@ static void msg_free_recv(struct ipmi_recv_msg *msg) 
	}

}

static struct ipmi_smi_msg smi_msg = INIT_IPMI_SMI_MSG(msg_free_smi);

static struct ipmi_recv_msg recv_msg = {

	.done = msg_free_recv

};

static struct ipmi_recv_msg recv_msg = INIT_IPMI_RECV_MSG(msg_free_recv);



static int __ipmi_set_timeout(struct ipmi_smi_msg  *smi_msg,

			      struct ipmi_recv_msg *recv_msg,
@@ -475,9 +473,8 @@ static void panic_recv_free(struct ipmi_recv_msg *msg) 


static struct ipmi_smi_msg panic_halt_heartbeat_smi_msg =

	INIT_IPMI_SMI_MSG(panic_smi_free);

static struct ipmi_recv_msg panic_halt_heartbeat_recv_msg = {

	.done = panic_recv_free

};

static struct ipmi_recv_msg panic_halt_heartbeat_recv_msg =

	INIT_IPMI_RECV_MSG(panic_recv_free);



static void panic_halt_ipmi_heartbeat(void)

{
@@ -515,9 +512,8 @@ static void panic_halt_ipmi_heartbeat(void) 


static struct ipmi_smi_msg panic_halt_smi_msg =

	INIT_IPMI_SMI_MSG(panic_smi_free);

static struct ipmi_recv_msg panic_halt_recv_msg = {

	.done = panic_recv_free

};

static struct ipmi_recv_msg panic_halt_recv_msg =

	INIT_IPMI_RECV_MSG(panic_recv_free);



/*

 * Special call, doesn't claim any locks.  This is only to be called

include/linux/ipmi.h

+5 −0
Original line number Diff line number Diff line
@@ -72,6 +72,11 @@ struct ipmi_recv_msg { 
	unsigned char   msg_data[IPMI_MAX_MSG_LENGTH];

};



#define INIT_IPMI_RECV_MSG(done_handler) \

{					\

	.done = done_handler		\

}



/* Allocate and free the receive message. */

void ipmi_free_recv_msg(struct ipmi_recv_msg *msg);