From 9fb7266cc7b7a505010902a430e02a1a75ad2775 Mon Sep 17 00:00:00 2001 From: Shengjiu Wang Date: Wed, 5 Jul 2017 15:29:40 +0800 Subject: MLK-13945-3: ASoC: fsl_asrc: support two asrc devices In imx8qm, there is two asrc devices, so using global structure "miscdevice" will cause error. Each instance should have their own structure. Signed-off-by: Shengjiu Wang Reviewed-by: Daniel Baluta --- sound/soc/fsl/fsl_asrc_m2m.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'sound/soc/fsl/fsl_asrc_m2m.c') diff --git a/sound/soc/fsl/fsl_asrc_m2m.c b/sound/soc/fsl/fsl_asrc_m2m.c index 3e5431eec7d9..14877b43c4e1 100644 --- a/sound/soc/fsl/fsl_asrc_m2m.c +++ b/sound/soc/fsl/fsl_asrc_m2m.c @@ -29,11 +29,6 @@ struct fsl_asrc_m2m { spinlock_t lock; }; -static struct miscdevice asrc_miscdev = { - .name = "mxc_asrc", - .minor = MISC_DYNAMIC_MINOR, -}; - static void fsl_asrc_get_status(struct fsl_asrc_pair *pair, struct asrc_status_flags *flags) { @@ -766,7 +761,8 @@ static long fsl_asrc_ioctl_flush(struct fsl_asrc_pair *pair, void __user *user) static long fsl_asrc_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { - struct fsl_asrc_pair *pair = file->private_data; + struct miscdevice *asrc_miscdev = file->private_data; + struct fsl_asrc_pair *pair = dev_get_drvdata(asrc_miscdev->this_device); struct fsl_asrc *asrc_priv = pair->asrc_priv; void __user *user = (void __user *)arg; long ret = 0; @@ -806,7 +802,8 @@ static long fsl_asrc_ioctl(struct file *file, unsigned int cmd, unsigned long ar static int fsl_asrc_open(struct inode *inode, struct file *file) { - struct fsl_asrc *asrc_priv = dev_get_drvdata(asrc_miscdev.this_device); + struct miscdevice *asrc_miscdev = file->private_data; + struct fsl_asrc *asrc_priv = dev_get_drvdata(asrc_miscdev->parent); struct device *dev = &asrc_priv->pdev->dev; struct fsl_asrc_pair *pair; struct fsl_asrc_m2m *m2m; @@ -836,7 +833,7 @@ static int fsl_asrc_open(struct inode *inode, struct file *file) spin_lock_init(&m2m->lock); - file->private_data = pair; + dev_set_drvdata(asrc_miscdev->this_device, pair); pm_runtime_get_sync(dev); @@ -849,7 +846,8 @@ out: static int fsl_asrc_close(struct inode *inode, struct file *file) { - struct fsl_asrc_pair *pair = file->private_data; + struct miscdevice *asrc_miscdev = file->private_data; + struct fsl_asrc_pair *pair = dev_get_drvdata(asrc_miscdev->this_device); struct fsl_asrc_m2m *m2m = pair->private; struct fsl_asrc *asrc_priv = pair->asrc_priv; struct device *dev = &asrc_priv->pdev->dev; @@ -887,7 +885,6 @@ static int fsl_asrc_close(struct inode *inode, struct file *file) kfree(m2m); kfree(pair); spin_unlock_irqrestore(&asrc_priv->lock, lock_flags); - file->private_data = NULL; pm_runtime_put_sync(dev); @@ -906,20 +903,24 @@ static int fsl_asrc_m2m_init(struct fsl_asrc *asrc_priv) struct device *dev = &asrc_priv->pdev->dev; int ret; - asrc_miscdev.fops = &asrc_fops, - ret = misc_register(&asrc_miscdev); + asrc_priv->asrc_miscdev.fops = &asrc_fops; + asrc_priv->asrc_miscdev.parent = dev; + asrc_priv->asrc_miscdev.name = asrc_priv->name; + asrc_priv->asrc_miscdev.minor = MISC_DYNAMIC_MINOR; + ret = misc_register(&asrc_priv->asrc_miscdev); if (ret) { dev_err(dev, "failed to register char device %d\n", ret); return ret; } - dev_set_drvdata(asrc_miscdev.this_device, asrc_priv); return 0; } static int fsl_asrc_m2m_remove(struct platform_device *pdev) { - misc_deregister(&asrc_miscdev); + struct fsl_asrc *asrc_priv = dev_get_drvdata(&pdev->dev); + + misc_deregister(&asrc_priv->asrc_miscdev); return 0; } -- cgit v1.2.3