diff options
| author |   Corey Minyard <cminyard@mvista.com> | 2022-04-12 15:49:47 -0500 |
|---|---|---|
| committer | Corey Minyard <cminyard@mvista.com> | 2022-05-12 10:00:03 -0500 |
| commit | f214549d717310f795c20db9497db3938116399d (patch) | |
| tree | 14f17cf72a510204c8f433deb292c31467ae6a52 | |
| parent | ipmi: Add an intializer for ipmi_smi_msg struct (diff) | |
| download | linux-dev-f214549d717310f795c20db9497db3938116399d.tar.xz linux-dev-f214549d717310f795c20db9497db3938116399d.zip | |
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: Corey Minyard <cminyard@mvista.com>
| -rw-r--r-- | drivers/char/ipmi/ipmi_poweroff.c | 4 | ||||
| -rw-r--r-- | drivers/char/ipmi/ipmi_watchdog.c | 14 | ||||
| -rw-r--r-- | include/linux/ipmi.h | 5 |
3 files changed, 11 insertions, 12 deletions
diff --git a/drivers/char/ipmi/ipmi_poweroff.c b/drivers/char/ipmi/ipmi_poweroff.c index 62e71c46ac5f..163ec9749e55 100644 --- a/drivers/char/ipmi/ipmi_poweroff.c +++ b/drivers/char/ipmi/ipmi_poweroff.c @@ -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); /* diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c index 4c1e9663ea47..5b4e677929ca 100644 --- a/drivers/char/ipmi/ipmi_watchdog.c +++ b/drivers/char/ipmi/ipmi_watchdog.c @@ -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 diff --git a/include/linux/ipmi.h b/include/linux/ipmi.h index 163831a087ef..a1c9c0d48ebf 100644 --- a/include/linux/ipmi.h +++ b/include/linux/ipmi.h @@ -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); |