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

Commit c3e6d407 authored by Sebastian Ott's avatar Sebastian Ott Committed by Martin Schwidefsky
Browse files

s390/scm: remove superfluous lock 



Remove the spinlock from struct scm_device. drvdata and attributes
are guarded via device_lock.

Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 50ab9a9a

arch/s390/include/asm/eadm.h

+0 −2
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 


#include <linux/types.h>

#include <linux/device.h>

#include <linux/spinlock.h>



struct arqb {

	u64 data;
@@ -83,7 +82,6 @@ struct scm_device { 
	u64 size;

	unsigned int nr_max_block;

	struct device dev;

	spinlock_t lock;

	struct {

		unsigned int persistence:4;

		unsigned int oper_state:4;

drivers/s390/block/scm_drv.c

+1 −10
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt



#include <linux/module.h>

#include <linux/spinlock.h>

#include <linux/slab.h>

#include <asm/eadm.h>

#include "scm_blk.h"
@@ -37,15 +36,10 @@ static int scm_probe(struct scm_device *scmdev) 
	if (!bdev)

		return -ENOMEM;



	spin_lock_irq(&scmdev->lock);

	dev_set_drvdata(&scmdev->dev, bdev);

	spin_unlock_irq(&scmdev->lock);



	ret = scm_blk_dev_setup(bdev, scmdev);

	if (ret) {

		spin_lock_irq(&scmdev->lock);

		dev_set_drvdata(&scmdev->dev, NULL);

		spin_unlock_irq(&scmdev->lock);

		kfree(bdev);

		goto out;

	}
@@ -56,12 +50,9 @@ static int scm_probe(struct scm_device *scmdev) 


static int scm_remove(struct scm_device *scmdev)

{

	struct scm_blk_dev *bdev;

	struct scm_blk_dev *bdev = dev_get_drvdata(&scmdev->dev);



	spin_lock_irq(&scmdev->lock);

	bdev = dev_get_drvdata(&scmdev->dev);

	dev_set_drvdata(&scmdev->dev, NULL);

	spin_unlock_irq(&scmdev->lock);

	scm_blk_dev_cleanup(bdev);

	kfree(bdev);

drivers/s390/cio/scm.c

+2 −4
Original line number Diff line number Diff line
@@ -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);

}



/*