diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-26 12:05:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-26 12:05:38 -0800 |
| commit | 9b0b0dd857652bf77d5350c6aec6cae767c48824 (patch) | |
| tree | 979fa660f4931636b970ffad10e72c5b8234d05a /drivers | |
| parent | 498a1cf902c31c3af398082d65cf150b33b367e6 (diff) | |
| parent | 95e158ec843666d76c09900507db08b76d77ce3e (diff) | |
| download | lwn-9b0b0dd857652bf77d5350c6aec6cae767c48824.tar.gz lwn-9b0b0dd857652bf77d5350c6aec6cae767c48824.zip | |
Merge tag 'hwlock-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux
Pull hwspinlock updates from Bjorn Andersson:
"This updates the sun6i DT binding to allow (and require) #hwlock-cells
and makes use of device_match_of_node() to slight clean up the
condition in of_hwspin_lock_get_id()"
* tag 'hwlock-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux:
dt-bindings: hwlock: sun6i: Add #hwlock-cells to example
dt-bindings: hwlock: sun6i: Add missing #hwlock-cells
hwspinlock: Use device_match_of_node()
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hwspinlock/hwspinlock_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwspinlock/hwspinlock_core.c b/drivers/hwspinlock/hwspinlock_core.c index fd5f5c5a5244..22b8f2a70b3b 100644 --- a/drivers/hwspinlock/hwspinlock_core.c +++ b/drivers/hwspinlock/hwspinlock_core.c @@ -367,7 +367,7 @@ int of_hwspin_lock_get_id(struct device_node *np, int index) continue; } - if (hwlock->bank->dev->of_node == args.np) { + if (device_match_of_node(hwlock->bank->dev, args.np)) { ret = 0; break; } |