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

Commit 35ebde12 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "qcedev : Solve compilation issues"

parents 5f8bf0c5 4130da7c

drivers/crypto/msm/qcedev.c

+10 −10
Original line number Diff line number Diff line
@@ -187,16 +187,6 @@ static int qcedev_release(struct inode *inode, struct file *file); 
static int start_cipher_req(struct qcedev_control *podev);

static int start_sha_req(struct qcedev_control *podev);



static const struct file_operations qcedev_fops = {

	.owner = THIS_MODULE,

	.unlocked_ioctl = qcedev_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl = compat_qcedev_ioctl,

#endif

	.open = qcedev_open,

	.release = qcedev_release,

};



static struct qcedev_control qce_dev[] = {

	{

		.magic = QCEDEV_MAGIC,
@@ -1994,6 +1984,16 @@ long qcedev_ioctl(struct file *file, 
	return err;

}



static const struct file_operations qcedev_fops = {

	.owner = THIS_MODULE,

	.unlocked_ioctl = qcedev_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl = compat_qcedev_ioctl,

#endif

	.open = qcedev_open,

	.release = qcedev_release,

};



static int qcedev_probe_device(struct platform_device *pdev)

{

	void *handle = NULL;