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 <changbin.du@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/s390/net/ctcm_fsms.c b/drivers/s390/net/ctcm_fsms.c
index 377e3689d1d4386910d473d0bd60b0e04fb53d68..06281a0a055210437a9f1ef03f34d48553173a5d 100644 (file)
--- a/drivers/s390/net/ctcm_fsms.c
+++ b/drivers/s390/net/ctcm_fsms.c
@@ -1444,7 +1444,7 @@ again:
                        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 19ee91acb89d9539c8e69ed0882ca59ce8c6a801..f0436f555c62a5f3ea13cfb4351a07a46cfc8f78 100644 (file)
--- 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. */