diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-05-04 20:46:00 +0200 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-05-04 20:46:00 +0200 |
commit | d0034a7a4ac7fae708146ac0059b9c47a1543f0d (patch) | |
tree | ac3ac88066f0f80632aa754e3ae008994f2426a2 /drivers/mailbox/tegra-hsp.c | |
parent | Input: elants_i2c - drop zero-checking of ABS_MT_TOUCH_MAJOR resolution (diff) | |
parent | MAINTAINERS: repair reference in HYCON HY46XX TOUCHSCREEN SUPPORT (diff) | |
download | linux-d0034a7a4ac7fae708146ac0059b9c47a1543f0d.tar.xz linux-d0034a7a4ac7fae708146ac0059b9c47a1543f0d.zip |
Merge branch 'next' into for-linus
Prepare input updates for 5.13 merge window.
Diffstat (limited to 'drivers/mailbox/tegra-hsp.c')
-rw-r--r-- | drivers/mailbox/tegra-hsp.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/mailbox/tegra-hsp.c b/drivers/mailbox/tegra-hsp.c index e07091d71986..acd0675da681 100644 --- a/drivers/mailbox/tegra-hsp.c +++ b/drivers/mailbox/tegra-hsp.c @@ -98,7 +98,9 @@ struct tegra_hsp { unsigned int num_ss; unsigned int num_db; unsigned int num_si; + spinlock_t lock; + struct lock_class_key lock_key; struct list_head doorbells; struct tegra_hsp_mailbox *mailboxes; @@ -775,6 +777,18 @@ static int tegra_hsp_probe(struct platform_device *pdev) return err; } + lockdep_register_key(&hsp->lock_key); + lockdep_set_class(&hsp->lock, &hsp->lock_key); + + return 0; +} + +static int tegra_hsp_remove(struct platform_device *pdev) +{ + struct tegra_hsp *hsp = platform_get_drvdata(pdev); + + lockdep_unregister_key(&hsp->lock_key); + return 0; } @@ -834,6 +848,7 @@ static struct platform_driver tegra_hsp_driver = { .pm = &tegra_hsp_pm_ops, }, .probe = tegra_hsp_probe, + .remove = tegra_hsp_remove, }; static int __init tegra_hsp_init(void) |