From c3e6d407c0c09fb46a391bdd0a28827472825de7 Mon Sep 17 00:00:00 2001 From: Sebastian Ott Date: Tue, 4 Sep 2012 19:36:41 +0200 Subject: 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 Signed-off-by: Martin Schwidefsky --- drivers/s390/cio/scm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'drivers/s390/cio') 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 */ -#include #include #include #include @@ -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); } /* -- cgit v1.2.2