A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-10 22:40:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

dlkm: fix free irq warning for chipone sensor

Browse source 
__free_irq warning triggered after running command rmmod
fpsensor_tee_spi. Use the matched function devm_free_irq().

Change-Id: I07dc06ea0afbd69827977c76a709ddfc5b39b843
Signed-off-by: wuwl10 <wuwl10@motorola.com>
Reviewed-on: https://gerrit.mot.com/1837444
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Hujun Liao <liaohj@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
Lei Chen 2020-11-25 15:06:25 +08:00 • committed by Weilong Wu
commit 0e9ba4e1fb
1 changed files with 48 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

66
drivers/input/misc/chipone_fps_mmi/fpsensor_spi_tee.c
View file

@ -250,11 +250,17 @@ static void fpsensor_dev_cleanup(fpsensor_data_t *fpsensor)
{
FUNC_ENTRY();
if (fpsensor->class == NULL) {
fpsensor_debug(INFO_LOG, "Cleanup with fpsensor = NULL\n");
goto out;
}
cdev_del(&fpsensor->cdev);
unregister_chrdev_region(fpsensor->devno, FPSENSOR_NR_DEVS);
device_destroy(fpsensor->class, fpsensor->devno);
class_destroy(fpsensor->class);
fpsensor->class = NULL;
out:
FUNC_EXIT();
}
@ -295,14 +301,18 @@ static long fpsensor_ioctl(struct file *filp, unsigned int cmd, unsigned long ar
break;
case FPSENSOR_IOC_EXIT:
fpsensor_disable_irq(fpsensor_dev);
if (fpsensor_dev->irq) {
free_irq(fpsensor_dev->irq, fpsensor_dev);
fpsensor_dev->irq_enabled = 0;
if(fpsensor_dev->device_available) {
fpsensor_disable_irq(fpsensor_dev);
if (fpsensor_dev->irq) {
devm_free_irq(&g_fpsensor->spi->dev, fpsensor_dev->irq, fpsensor_dev);
fpsensor_dev->irq_enabled = 0;
}
fpsensor_dev->device_available = 0;
fpsensor_gpio_free(fpsensor_dev);
fpsensor_debug(INFO_LOG, "%s: fpsensor exit finished======\n", __func__);
} else {
fpsensor_debug(INFO_LOG, "%s: IOC_EXIT with device_available = 0 ======\n", __func__);
}
fpsensor_dev->device_available = 0;
fpsensor_gpio_free(fpsensor_dev);
fpsensor_debug(INFO_LOG, "%s: fpsensor exit finished======\n", __func__);
break;
case FPSENSOR_IOC_RESET:
@ -341,13 +351,17 @@ static long fpsensor_ioctl(struct file *filp, unsigned int cmd, unsigned long ar
fpsensor_debug(INFO_LOG, "%s: FPSENSOR_IOC_DISABLE_POWER ======\n", __func__);
break;
case FPSENSOR_IOC_REMOVE:
fpsensor_disable_irq(fpsensor_dev);
if (fpsensor_dev->irq) {
free_irq(fpsensor_dev->irq, fpsensor_dev);
fpsensor_dev->irq_enabled = 0;
if(fpsensor_dev->device_available) {
fpsensor_disable_irq(fpsensor_dev);
if (fpsensor_dev->irq) {
devm_free_irq(&g_fpsensor->spi->dev, fpsensor_dev->irq, fpsensor_dev);
fpsensor_dev->irq_enabled = 0;
}
fpsensor_gpio_free(fpsensor_dev);
fpsensor_dev->device_available = 0;
} else {
fpsensor_debug(INFO_LOG, "%s: IOC_REMOVE with device_available = 0 ======\n", __func__);
}
fpsensor_dev->device_available = 0;
fpsensor_gpio_free(fpsensor_dev);
fpsensor_dev_cleanup(fpsensor_dev);
#if FP_NOTIFY
fpsensor_fb_unregister_client(&fpsensor_dev->notifier);
@ -655,27 +669,43 @@ out:
static int fpsensor_remove(struct platform_device *pdev)
{
fpsensor_data_t *fpsensor_dev = g_fpsensor;
int ret = 0;
FUNC_ENTRY();
fpsensor_disable_irq(fpsensor_dev);
if (fpsensor_dev->irq)
free_irq(fpsensor_dev->irq, fpsensor_dev);
if (g_fpsensor == NULL) {
fpsensor_debug(ERR_LOG, "%s with g_fpsensor = NULL\n", __func__);
ret = -EINVAL;
goto out;
}
if(fpsensor_dev->device_available) {
fpsensor_disable_irq(fpsensor_dev);
if (fpsensor_dev->irq)
devm_free_irq(&g_fpsensor->spi->dev, fpsensor_dev->irq, fpsensor_dev);
fpsensor_gpio_free(fpsensor_dev);
fpsensor_dev->device_available = 0;
}
#if FP_NOTIFY
fpsensor_fb_unregister_client(&fpsensor_dev->notifier);
#endif
fpsensor_gpio_free(fpsensor_dev);
fpsensor_dev_cleanup(fpsensor_dev);
#if FPSENSOR_WAKEUP_TYPE == FPSENSOR_WAKEUP_SOURCE
wakeup_source_trash_internal(&g_ttw_wl);
#else
wake_lock_destroy(&g_ttw_wl);
#endif
kfree(fpsensor_dev);
g_fpsensor = NULL;
out:
FUNC_EXIT();
return 0;
return ret;
}
static int fpsensor_suspend(struct platform_device *pdev, pm_message_t state)