2021-08-14 01:05:36

by Changbin Du

Subject: [PATCH] s390/net: replace in_irq() with in_hardirq()

Replace the obsolete and ambiguos macro in_irq() with new
macro in_hardirq().

Signed-off-by: Changbin Du <[email protected]>
---
drivers/s390/net/ctcm_fsms.c | 2 +-
drivers/s390/net/ctcm_mpc.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/s390/net/ctcm_fsms.c b/drivers/s390/net/ctcm_fsms.c
index 377e3689d1d4..06281a0a0552 100644
--- a/drivers/s390/net/ctcm_fsms.c
+++ b/drivers/s390/net/ctcm_fsms.c
@@ -1444,7 +1444,7 @@ static void ctcmpc_chx_rx(fsm_instance *fi, int event, void *arg)
if (do_debug_ccw)
ctcmpc_dumpit((char *)&ch->ccw[0],
sizeof(struct ccw1) * 3);
- dolock = !in_irq();
+ dolock = !in_hardirq();
if (dolock)
spin_lock_irqsave(
get_ccwdev_lock(ch->cdev), saveflags);
diff --git a/drivers/s390/net/ctcm_mpc.c b/drivers/s390/net/ctcm_mpc.c
index 19ee91acb89d..f0436f555c62 100644
--- a/drivers/s390/net/ctcm_mpc.c
+++ b/drivers/s390/net/ctcm_mpc.c
@@ -1773,7 +1773,7 @@ static void mpc_action_side_xid(fsm_instance *fsm, void *arg, int side)
CTCM_D3_DUMP((char *)ch->xid, XID2_LENGTH);
CTCM_D3_DUMP((char *)ch->xid_id, 4);

- if (!in_irq()) {
+ if (!in_hardirq()) {
/* Such conditional locking is a known problem for
* sparse because its static undeterministic.
* Warnings should be ignored here. */
--
2.30.2

2021-08-16 10:22:44

by patchwork-bot+netdevbpf

Subject: Re: [PATCH] s390/net: replace in_irq() with in_hardirq()

Hello:

This patch was applied to netdev/net-next.git (refs/heads/master):

On Sat, 14 Aug 2021 09:03:34 +0800 you wrote:
> Replace the obsolete and ambiguos macro in_irq() with new
> macro in_hardirq().
>
> Signed-off-by: Changbin Du <[email protected]>
> ---
> drivers/s390/net/ctcm_fsms.c | 2 +-
> drivers/s390/net/ctcm_mpc.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)

Here is the summary with links:
- s390/net: replace in_irq() with in_hardirq()
https://git.kernel.org/netdev/net-next/c/e871ee694184

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html