summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavier Martinez Canillas <martinez.javier@gmail.com>2011-03-07 02:36:13 +0100
committerJavier Martinez Canillas <martinez.javier@gmail.com>2011-03-07 02:36:13 +0100
commitf4090456c4eaf46e7306732a95916da512c0c3d0 (patch)
tree3b2f745ad1c52e5313f4e415758325ca4c4c2f39
parentfd1f972e01b7321508c2d25bee094a8669926cc3 (diff)
downloadldd3-f4090456c4eaf46e7306732a95916da512c0c3d0.tar.gz
scull: access: Replace old style lock initializer
SPIN_LOCK_UNLOCKED is deprecated. Use DEFINE_SPINLOCK instead.
-rw-r--r--scull/access.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/scull/access.c b/scull/access.c
index 141ff80..96b1c6b 100644
--- a/scull/access.c
+++ b/scull/access.c
@@ -97,7 +97,7 @@ struct file_operations scull_sngl_fops = {
static struct scull_dev scull_u_device;
static int scull_u_count; /* initialized to 0 by default */
static uid_t scull_u_owner; /* initialized to 0 by default */
-static spinlock_t scull_u_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(scull_u_lock);
static int scull_u_open(struct inode *inode, struct file *filp)
{
@@ -159,7 +159,7 @@ static struct scull_dev scull_w_device;
static int scull_w_count; /* initialized to 0 by default */
static uid_t scull_w_owner; /* initialized to 0 by default */
static DECLARE_WAIT_QUEUE_HEAD(scull_w_wait);
-static spinlock_t scull_w_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(scull_w_lock);
static inline int scull_w_available(void)
{
@@ -239,7 +239,7 @@ struct scull_listitem {
/* The list of devices, and a lock to protect it */
static LIST_HEAD(scull_c_list);
-static spinlock_t scull_c_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(scull_c_lock);
/* A placeholder scull_dev which really just holds the cdev stuff. */
static struct scull_dev scull_c_device;