lockdep: further simplify mark_lock_irq() helpers