Skip to contentSkip to conversation

misc: open-dice: Fix spurious lockdep warning

PATCH New Will Deacon 1 participant 1 message Jan 26, 2024 Char and misc drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 misc: open-dice: Fix spurious lockdep warning

When probing the open-dice driver with PROVE_LOCKING=y, lockdep complains that the mutex in 'drvdata->lock' has a non-static key:

 | INFO: trying to register non-static key.
 | The code is fine but needs lockdep annotation, or maybe
 | you didn't initialize this object before use?
 | turning off the locking correctness validator.

Fix the problem by initialising the mutex memory with mutex_init() instead of __MUTEX_INITIALIZER().

Cc Arnd Bergmann <[email protected]>
Cc David Brazdil <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
---
 drivers/misc/open-dice.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/open-dice.c +1 -1
index 8aea2d070a40..d279a4f195e2 100644
@@ -140,7 +140,6 @@ static int __init open_dice_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	*drvdata = (struct open_dice_drvdata){
-		.lock = __MUTEX_INITIALIZER(drvdata->lock),
 		.rmem = rmem,
 		.misc = (struct miscdevice){
 			.parent	= dev,
@@ -150,6 +149,7 @@ static int __init open_dice_probe(struct platform_device *pdev)
 			.mode	= 0600,
 		},
 	};
+	mutex_init(&drvdata->lock);
 
 	/* Index overflow check not needed, misc_register() will fail. */
 	snprintf(drvdata->name, sizeof(drvdata->name), DRIVER_NAME"%u", dev_idx++);
Signature · 1 line
2.43.0.429.g432eaa2c6b-goog