samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFC: driver: Support new i2c_driver remove api

Browse Source 
"struct i2c_driver".remove function's return type is
changed from int to void in kernel version 6.1.0.
Support new i2c_driver remove API for NFC driver.

Change-Id: I2fc0d4a044afd49cc08c8b2486ce355a5857e202
Signed-off-by: Maria Yu <quic_aiquny@quicinc.com>
Signed-off-by: Amruth Naga <quic_amrunaga@quicinc.com>
This commit is contained in:
Maria Yu
2022-12-14 22:03:59 +08:00
committed by Amruth Naga
parent f616cf76bd
commit e24f9d0b47
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nfc/i2c_drv.c
View File

@@ -461,21 +461,27 @@ err:
return ret; return ret;
} }
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
void nfc_i2c_dev_remove(struct i2c_client *client)
#else
int nfc_i2c_dev_remove(struct i2c_client *client) int nfc_i2c_dev_remove(struct i2c_client *client)
#endif
{ {
int ret = 0;
struct nfc_dev *nfc_dev = NULL; struct nfc_dev *nfc_dev = NULL;
pr_info("%s: remove device\n", __func__); pr_info("%s: remove device\n", __func__);
nfc_dev = i2c_get_clientdata(client); nfc_dev = i2c_get_clientdata(client);
if (!nfc_dev) { if (!nfc_dev) {
pr_err("%s: device doesn't exist anymore\n", __func__); pr_err("%s: device doesn't exist anymore\n", __func__);
ret = -ENODEV; #if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 0))
return ret; return -ENODEV;
#endif
} }
if (nfc_dev->dev_ref_count > 0) { if (nfc_dev->dev_ref_count > 0) {
pr_err("%s: device already in use\n", __func__); pr_err("%s: device already in use\n", __func__);
#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 0))
return -EBUSY; return -EBUSY;
#endif
} }
gpio_set_value(nfc_dev->configs.gpio.ven, 0); gpio_set_value(nfc_dev->configs.gpio.ven, 0);
@@ -496,7 +502,9 @@ int nfc_i2c_dev_remove(struct i2c_client *client)
kfree(nfc_dev->read_kbuf); kfree(nfc_dev->read_kbuf);
kfree(nfc_dev->write_kbuf); kfree(nfc_dev->write_kbuf);
kfree(nfc_dev); kfree(nfc_dev);
return ret; #if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 0))
return 0;
#endif
} }
int nfc_i2c_dev_suspend(struct device *device) int nfc_i2c_dev_suspend(struct device *device)

5
nfc/i2c_drv.h
View File

@@ -25,6 +25,7 @@
#define _I2C_DRV_H_ #define _I2C_DRV_H_
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/version.h>
#define NFC_I2C_DRV_STR "qcom,sn-nci" /*kept same as dts */ #define NFC_I2C_DRV_STR "qcom,sn-nci" /*kept same as dts */
#define NFC_I2C_DEV_ID "sn-i2c" #define NFC_I2C_DEV_ID "sn-i2c"
@@ -44,7 +45,11 @@ struct i2c_dev {
long nfc_i2c_dev_ioctl(struct file *pfile, unsigned int cmd, unsigned long arg); long nfc_i2c_dev_ioctl(struct file *pfile, unsigned int cmd, unsigned long arg);
int nfc_i2c_dev_probe(struct i2c_client *client, int nfc_i2c_dev_probe(struct i2c_client *client,
const struct i2c_device_id *id); const struct i2c_device_id *id);
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
void nfc_i2c_dev_remove(struct i2c_client *client);
#else
int nfc_i2c_dev_remove(struct i2c_client *client); int nfc_i2c_dev_remove(struct i2c_client *client);
#endif
int nfc_i2c_dev_suspend(struct device *device); int nfc_i2c_dev_suspend(struct device *device);
int nfc_i2c_dev_resume(struct device *device); int nfc_i2c_dev_resume(struct device *device);