Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'hwlock-v6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux
Pull hwspinlock updates from Bjorn Andersson:
- Correct kernel-doc through the hwspinlock core, to address build
warnings (and improve the documentation)
- Drop unused compatible in the Qualcomm TCSR mutex driver
* tag 'hwlock-v6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux:
hwspinlock/core: fix kernel-doc warnings
hwspinlock: qcom: Remove IPQ6018 SOC specific compatible
+29
-25
+29
-24
drivers/hwspinlock/hwspinlock_core.c
+29
-24
drivers/hwspinlock/hwspinlock_core.c
···
84
84
* should decide between spin_trylock, spin_trylock_irq and
85
85
* spin_trylock_irqsave.
86
86
*
87
-
* Returns 0 if we successfully locked the hwspinlock or -EBUSY if
87
+
* Returns: %0 if we successfully locked the hwspinlock or -EBUSY if
88
88
* the hwspinlock was already taken.
89
+
*
89
90
* This function will never sleep.
90
91
*/
91
92
int __hwspin_trylock(struct hwspinlock *hwlock, int mode, unsigned long *flags)
···
172
171
/**
173
172
* __hwspin_lock_timeout() - lock an hwspinlock with timeout limit
174
173
* @hwlock: the hwspinlock to be locked
175
-
* @timeout: timeout value in msecs
174
+
* @to: timeout value in msecs
176
175
* @mode: mode which controls whether local interrupts are disabled or not
177
176
* @flags: a pointer to where the caller's interrupt state will be saved at (if
178
177
* requested)
···
200
199
* to choose the appropriate @mode of operation, exactly the same way users
201
200
* should decide between spin_lock, spin_lock_irq and spin_lock_irqsave.
202
201
*
203
-
* Returns 0 when the @hwlock was successfully taken, and an appropriate
202
+
* Returns: %0 when the @hwlock was successfully taken, and an appropriate
204
203
* error code otherwise (most notably -ETIMEDOUT if the @hwlock is still
205
-
* busy after @timeout msecs). The function will never sleep.
204
+
* busy after @timeout msecs).
205
+
*
206
+
* The function will never sleep.
206
207
*/
207
208
int __hwspin_lock_timeout(struct hwspinlock *hwlock, unsigned int to,
208
209
int mode, unsigned long *flags)
···
307
304
308
305
/**
309
306
* of_hwspin_lock_simple_xlate - translate hwlock_spec to return a lock id
310
-
* @bank: the hwspinlock device bank
311
307
* @hwlock_spec: hwlock specifier as found in the device tree
312
308
*
313
309
* This is a simple translation function, suitable for hwspinlock platform
314
310
* drivers that only has a lock specifier length of 1.
315
311
*
316
-
* Returns a relative index of the lock within a specified bank on success,
312
+
* Returns: a relative index of the lock within a specified bank on success,
317
313
* or -EINVAL on invalid specifier cell count.
318
314
*/
319
315
static inline int
···
334
332
* hwspinlock device, so that it can be requested using the normal
335
333
* hwspin_lock_request_specific() API.
336
334
*
337
-
* Returns the global lock id number on success, -EPROBE_DEFER if the hwspinlock
338
-
* device is not yet registered, -EINVAL on invalid args specifier value or an
339
-
* appropriate error as returned from the OF parsing of the DT client node.
335
+
* Returns: the global lock id number on success, -EPROBE_DEFER if the
336
+
* hwspinlock device is not yet registered, -EINVAL on invalid args
337
+
* specifier value or an appropriate error as returned from the OF parsing
338
+
* of the DT client node.
340
339
*/
341
340
int of_hwspin_lock_get_id(struct device_node *np, int index)
342
341
{
···
402
399
* the hwspinlock device, so that it can be requested using the normal
403
400
* hwspin_lock_request_specific() API.
404
401
*
405
-
* Returns the global lock id number on success, -EPROBE_DEFER if the hwspinlock
406
-
* device is not yet registered, -EINVAL on invalid args specifier value or an
407
-
* appropriate error as returned from the OF parsing of the DT client node.
402
+
* Returns: the global lock id number on success, -EPROBE_DEFER if the
403
+
* hwspinlock device is not yet registered, -EINVAL on invalid args
404
+
* specifier value or an appropriate error as returned from the OF parsing
405
+
* of the DT client node.
408
406
*/
409
407
int of_hwspin_lock_get_id_byname(struct device_node *np, const char *name)
410
408
{
···
485
481
*
486
482
* Should be called from a process context (might sleep)
487
483
*
488
-
* Returns 0 on success, or an appropriate error code on failure
484
+
* Returns: %0 on success, or an appropriate error code on failure
489
485
*/
490
486
int hwspin_lock_register(struct hwspinlock_device *bank, struct device *dev,
491
487
const struct hwspinlock_ops *ops, int base_id, int num_locks)
···
533
529
*
534
530
* Should be called from a process context (might sleep)
535
531
*
536
-
* Returns 0 on success, or an appropriate error code on failure
532
+
* Returns: %0 on success, or an appropriate error code on failure
537
533
*/
538
534
int hwspin_lock_unregister(struct hwspinlock_device *bank)
539
535
{
···
582
578
*
583
579
* Should be called from a process context (might sleep)
584
580
*
585
-
* Returns 0 on success, or an appropriate error code on failure
581
+
* Returns: %0 on success, or an appropriate error code on failure
586
582
*/
587
583
int devm_hwspin_lock_unregister(struct device *dev,
588
584
struct hwspinlock_device *bank)
···
611
607
*
612
608
* Should be called from a process context (might sleep)
613
609
*
614
-
* Returns 0 on success, or an appropriate error code on failure
610
+
* Returns: %0 on success, or an appropriate error code on failure
615
611
*/
616
612
int devm_hwspin_lock_register(struct device *dev,
617
613
struct hwspinlock_device *bank,
···
639
635
640
636
/**
641
637
* __hwspin_lock_request() - tag an hwspinlock as used and power it up
638
+
* @hwlock: the target hwspinlock
642
639
*
643
640
* This is an internal function that prepares an hwspinlock instance
644
641
* before it is given to the user. The function assumes that
645
642
* hwspinlock_tree_lock is taken.
646
643
*
647
-
* Returns 0 or positive to indicate success, and a negative value to
644
+
* Returns: %0 or positive to indicate success, and a negative value to
648
645
* indicate an error (with the appropriate error code)
649
646
*/
650
647
static int __hwspin_lock_request(struct hwspinlock *hwlock)
···
685
680
* hwspin_lock_get_id() - retrieve id number of a given hwspinlock
686
681
* @hwlock: a valid hwspinlock instance
687
682
*
688
-
* Returns the id number of a given @hwlock, or -EINVAL if @hwlock is invalid.
683
+
* Returns: the id number of a given @hwlock, or -EINVAL if @hwlock is invalid.
689
684
*/
690
685
int hwspin_lock_get_id(struct hwspinlock *hwlock)
691
686
{
···
709
704
*
710
705
* Should be called from a process context (might sleep)
711
706
*
712
-
* Returns the address of the assigned hwspinlock, or NULL on error
707
+
* Returns: the address of the assigned hwspinlock, or %NULL on error
713
708
*/
714
709
struct hwspinlock *hwspin_lock_request(void)
715
710
{
···
752
747
*
753
748
* Should be called from a process context (might sleep)
754
749
*
755
-
* Returns the address of the assigned hwspinlock, or NULL on error
750
+
* Returns: the address of the assigned hwspinlock, or %NULL on error
756
751
*/
757
752
struct hwspinlock *hwspin_lock_request_specific(unsigned int id)
758
753
{
···
800
795
*
801
796
* Should be called from a process context (might sleep)
802
797
*
803
-
* Returns 0 on success, or an appropriate error code on failure
798
+
* Returns: %0 on success, or an appropriate error code on failure
804
799
*/
805
800
int hwspin_lock_free(struct hwspinlock *hwlock)
806
801
{
···
870
865
*
871
866
* Should be called from a process context (might sleep)
872
867
*
873
-
* Returns 0 on success, or an appropriate error code on failure
868
+
* Returns: %0 on success, or an appropriate error code on failure
874
869
*/
875
870
int devm_hwspin_lock_free(struct device *dev, struct hwspinlock *hwlock)
876
871
{
···
896
891
*
897
892
* Should be called from a process context (might sleep)
898
893
*
899
-
* Returns the address of the assigned hwspinlock, or NULL on error
894
+
* Returns: the address of the assigned hwspinlock, or %NULL on error
900
895
*/
901
896
struct hwspinlock *devm_hwspin_lock_request(struct device *dev)
902
897
{
···
931
926
*
932
927
* Should be called from a process context (might sleep)
933
928
*
934
-
* Returns the address of the assigned hwspinlock, or NULL on error
929
+
* Returns: the address of the assigned hwspinlock, or %NULL on error
935
930
*/
936
931
struct hwspinlock *devm_hwspin_lock_request_specific(struct device *dev,
937
932
unsigned int id)
-1
drivers/hwspinlock/qcom_hwspinlock.c
-1
drivers/hwspinlock/qcom_hwspinlock.c
···
115
115
{ .compatible = "qcom,sfpb-mutex", .data = &of_sfpb_mutex },
116
116
{ .compatible = "qcom,tcsr-mutex", .data = &of_tcsr_mutex },
117
117
{ .compatible = "qcom,apq8084-tcsr-mutex", .data = &of_msm8226_tcsr_mutex },
118
-
{ .compatible = "qcom,ipq6018-tcsr-mutex", .data = &of_msm8226_tcsr_mutex },
119
118
{ .compatible = "qcom,msm8226-tcsr-mutex", .data = &of_msm8226_tcsr_mutex },
120
119
{ .compatible = "qcom,msm8974-tcsr-mutex", .data = &of_msm8226_tcsr_mutex },
121
120
{ .compatible = "qcom,msm8994-tcsr-mutex", .data = &of_msm8226_tcsr_mutex },