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

Commit 4f0076f7 authored by Martin Schwidefsky's avatar Martin Schwidefsky
Browse files

[S390] driver_data access 



Replace the remaining direct accesses to the driver_data pointer
with calls to the dev_get_drvdata() and dev_set_drvdata() functions.

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 4a9c7525

drivers/s390/char/con3215.c

+2 −2
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ static int raw3215_pm_stop(struct ccw_device *cdev) 
	unsigned long flags;



	/* Empty the output buffer, then prevent new I/O. */

	raw = cdev->dev.driver_data;

	raw = dev_get_drvdata(&cdev->dev);

	spin_lock_irqsave(get_ccwdev_lock(raw->cdev), flags);

	raw3215_make_room(raw, RAW3215_BUFFER_SIZE);

	raw->flags |= RAW3215_FROZEN;
@@ -746,7 +746,7 @@ static int raw3215_pm_start(struct ccw_device *cdev) 
	unsigned long flags;



	/* Allow I/O again and flush output buffer. */

	raw = cdev->dev.driver_data;

	raw = dev_get_drvdata(&cdev->dev);

	spin_lock_irqsave(get_ccwdev_lock(raw->cdev), flags);

	raw->flags &= ~RAW3215_FROZEN;

	raw->flags |= RAW3215_FLUSHING;

drivers/s390/char/monreader.c

+3 −3
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ static int mon_open(struct inode *inode, struct file *filp) 
		goto out_path;

	}

	filp->private_data = monpriv;

	monreader_device->driver_data = monpriv;

	dev_set_drvdata(&monreader_device, monpriv);

	unlock_kernel();

	return nonseekable_open(inode, filp);
@@ -463,7 +463,7 @@ static struct miscdevice mon_dev = { 
 *****************************************************************************/

static int monreader_freeze(struct device *dev)

{

	struct mon_private *monpriv = dev->driver_data;

	struct mon_private *monpriv = dev_get_drvdata(&dev);

	int rc;



	if (!monpriv)
@@ -487,7 +487,7 @@ static int monreader_freeze(struct device *dev) 


static int monreader_thaw(struct device *dev)

{

	struct mon_private *monpriv = dev->driver_data;

	struct mon_private *monpriv = dev_get_drvdata(dev);

	int rc;



	if (!monpriv)

drivers/s390/char/raw3270.c

+2 −2
Original line number Diff line number Diff line
@@ -1322,7 +1322,7 @@ static int raw3270_pm_stop(struct ccw_device *cdev) 
	struct raw3270_view *view;

	unsigned long flags;



	rp = cdev->dev.driver_data;

	rp = dev_get_drvdata(&cdev->dev);

	if (!rp)

		return 0;

	spin_lock_irqsave(get_ccwdev_lock(rp->cdev), flags);
@@ -1348,7 +1348,7 @@ static int raw3270_pm_start(struct ccw_device *cdev) 
	struct raw3270 *rp;

	unsigned long flags;



	rp = cdev->dev.driver_data;

	rp = dev_get_drvdata(&cdev->dev);

	if (!rp)

		return 0;

	spin_lock_irqsave(get_ccwdev_lock(rp->cdev), flags);

drivers/s390/char/tape_core.c

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ int tape_generic_pm_suspend(struct ccw_device *cdev) 
{

	struct tape_device *device;



	device = cdev->dev.driver_data;

	device = dev_get_drvdata(&cdev->dev);

	if (!device) {

		return -ENODEV;

	}

drivers/s390/char/vmlogrdr.c

+2 −2
Original line number Diff line number Diff line
@@ -663,7 +663,7 @@ static struct attribute *vmlogrdr_attrs[] = { 
static int vmlogrdr_pm_prepare(struct device *dev)

{

	int rc;

	struct vmlogrdr_priv_t *priv = dev->driver_data;

	struct vmlogrdr_priv_t *priv = dev_get_drvdata(dev);



	rc = 0;

	if (priv) {
@@ -753,7 +753,7 @@ static int vmlogrdr_register_device(struct vmlogrdr_priv_t *priv) 
		dev->bus = &iucv_bus;

		dev->parent = iucv_root;

		dev->driver = &vmlogrdr_driver;

		dev->driver_data = priv;

		dev_set_drvdata(dev, priv);

		/*

		 * The release function could be called after the

		 * module has been unloaded. It's _only_ task is to