If CONFIG_LOCKDEP is enabled, use lockdep_assert_held() rather than an explicit check for the chip's register mutex. Signed-off-by: Luke Howard --- drivers/net/dsa/mv88e6xxx/chip.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 80b877c74513d..eada2f71cb7b3 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -48,10 +48,14 @@ static void assert_reg_lock(struct mv88e6xxx_chip *chip) { +#ifdef CONFIG_LOCKDEP + lockdep_assert_held(&chip->reg_lock); +#else if (unlikely(!mutex_is_locked(&chip->reg_lock))) { dev_err(chip->dev, "Switch registers lock not held!\n"); dump_stack(); } +#endif } int mv88e6xxx_read(struct mv88e6xxx_chip *chip, int addr, int reg, u16 *val) -- 2.43.0