aboutsummaryrefslogtreecommitdiff
path: root/drivers/s390/cio
diff options
context:
space:
mode:
authorSebastian Ott <sebott@linux.vnet.ibm.com>2012-09-04 19:36:41 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2012-09-26 15:45:09 +0200
commitc3e6d407c0c09fb46a391bdd0a28827472825de7 (patch)
treee81b40186f8224dd0e8f62f77c29d445d91e5873 /drivers/s390/cio
parent50ab9a9a60fc83b8e8db36b54f365226e2b139ac (diff)
downloadvexpress-lsk-c3e6d407c0c09fb46a391bdd0a28827472825de7.tar.gz
s390/scm: remove superfluous lock
Remove the spinlock from struct scm_device. drvdata and attributes are guarded via device_lock. Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/cio')
-rw-r--r--drivers/s390/cio/scm.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/s390/cio/scm.c b/drivers/s390/cio/scm.c
index aa4476e9205..bcf20f3aa51 100644
--- a/drivers/s390/cio/scm.c
+++ b/drivers/s390/cio/scm.c
@@ -5,7 +5,6 @@
* Author(s): Sebastian Ott <sebott@linux.vnet.ibm.com>
*/
-#include <linux/spinlock.h>
#include <linux/device.h>
#include <linux/module.h>
#include <linux/mutex.h>
@@ -134,9 +133,9 @@ static ssize_t show_##name(struct device *dev, \
struct scm_device *scmdev = to_scm_dev(dev); \
int ret; \
\
- spin_lock(&scmdev->lock); \
+ device_lock(dev); \
ret = sprintf(buf, "%u\n", scmdev->attrs.name); \
- spin_unlock(&scmdev->lock); \
+ device_unlock(dev); \
\
return ret; \
} \
@@ -193,7 +192,6 @@ static void scmdev_setup(struct scm_device *scmdev, struct sale *sale,
scmdev->dev.bus = &scm_bus_type;
scmdev->dev.release = scmdev_release;
scmdev->dev.groups = scmdev_attr_groups;
- spin_lock_init(&scmdev->lock);
}
/*