Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d04fa5a3 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

locking: Remove deprecated lock initializers 



Last users are gone. Remove the left overs.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 10389a15

Documentation/spinlocks.txt

+1 −23
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ to change the variables it has to get an exclusive write lock. 


The routines look the same as above:



   rwlock_t xxx_lock = RW_LOCK_UNLOCKED;

   rwlock_t xxx_lock = __RW_LOCK_UNLOCKED(xxx_lock);



	unsigned long flags;
@@ -196,25 +196,3 @@ appropriate: 


For static initialization, use DEFINE_SPINLOCK() / DEFINE_RWLOCK() or

__SPIN_LOCK_UNLOCKED() / __RW_LOCK_UNLOCKED() as appropriate.
 


SPIN_LOCK_UNLOCKED and RW_LOCK_UNLOCKED are deprecated.  These interfere

with lockdep state tracking.



Most of the time, you can simply turn:

	static spinlock_t xxx_lock = SPIN_LOCK_UNLOCKED;

into:

	static DEFINE_SPINLOCK(xxx_lock);



Static structure member variables go from:



	struct foo bar {

		.lock	=	SPIN_LOCK_UNLOCKED;

	};



to:



	struct foo bar {

		.lock	=	__SPIN_LOCK_UNLOCKED(bar.lock);

	};



Declaration of static rw_locks undergo a similar transformation.

include/linux/rwlock_types.h

+0 −8
Original line number Diff line number Diff line
@@ -43,14 +43,6 @@ typedef struct { 
				RW_DEP_MAP_INIT(lockname) }

#endif



/*

 * RW_LOCK_UNLOCKED defeat lockdep state tracking and is hence

 * deprecated.

 *

 * Please use DEFINE_RWLOCK() or __RW_LOCK_UNLOCKED() as appropriate.

 */

#define RW_LOCK_UNLOCKED	__RW_LOCK_UNLOCKED(old_style_rw_init)



#define DEFINE_RWLOCK(x)	rwlock_t x = __RW_LOCK_UNLOCKED(x)



#endif /* __LINUX_RWLOCK_TYPES_H */

include/linux/spinlock_types.h

+0 −8
Original line number Diff line number Diff line
@@ -81,14 +81,6 @@ typedef struct spinlock { 
#define __SPIN_LOCK_UNLOCKED(lockname) \

	(spinlock_t ) __SPIN_LOCK_INITIALIZER(lockname)



/*

 * SPIN_LOCK_UNLOCKED defeats lockdep state tracking and is hence

 * deprecated.

 * Please use DEFINE_SPINLOCK() or __SPIN_LOCK_UNLOCKED() as

 * appropriate.

 */

#define SPIN_LOCK_UNLOCKED	__SPIN_LOCK_UNLOCKED(old_style_spin_init)



#define DEFINE_SPINLOCK(x)	spinlock_t x = __SPIN_LOCK_UNLOCKED(x)



#include <linux/rwlock_types.h>

scripts/checkpatch.pl

+0 −5
Original line number Diff line number Diff line
@@ -2654,11 +2654,6 @@ sub process { 
			WARN("Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt\n" . $herecurr);

		}



# SPIN_LOCK_UNLOCKED & RW_LOCK_UNLOCKED are deprecated

		if ($line =~ /\b(SPIN_LOCK_UNLOCKED|RW_LOCK_UNLOCKED)/) {

			ERROR("Use of $1 is deprecated: see Documentation/spinlocks.txt\n" . $herecurr);

		}



# warn about #if 0

		if ($line =~ /^.\s*\#\s*if\s+0\b/) {

			CHK("if this code is redundant consider removing it\n" .