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

Commit 99357742 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[S390] monreader: fix dev_set_drvdata conversion 



Fix this:

drivers/s390/char/monreader.c: In function 'mon_open':
drivers/s390/char/monreader.c:323: warning: passing argument 1 of 'dev_set_drvdata' from incompatible pointer type
include/linux/device.h:457: note: expected 'struct device *' but argument is of type 'struct device **'
drivers/s390/char/monreader.c: In function 'monreader_freeze':
drivers/s390/char/monreader.c:466: warning: passing argument 1 of 'dev_get_drvdata' from incompatible pointer type
include/linux/device.h:452: note: expected 'const struct device *' but argument is of type 'struct device **'

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent c9568fdd

drivers/s390/char/monreader.c

+2 −2
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;

	dev_set_drvdata(&monreader_device, 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_get_drvdata(&dev);

	struct mon_private *monpriv = dev_get_drvdata(dev);

	int rc;



	if (!monpriv)