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-14 08:36:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix compile issue on Kernel version 6.1.25

Browse source 
Fix compile issue on Kernel version 6.1.25 to use new remove
function protype of i2c device driver.

Change-Id: I9ba5254fd65da48be78a0bbd7362fcf2c92f2250
Signed-off-by: Yonghua Yan <yanyh2@motorola.com>
Reviewed-on: https://gerrit.mot.com/2777335
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Tested-by: Jira Key
Submit-Approved: Jira Key
This commit is contained in:
Yonghua Yan 2023-10-26 12:00:30 +08:00
commit c12e5182ad
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
drivers/power/sc760x_charger_mmi/sc760x_charger_mmi.c
View file

@ -56,6 +56,7 @@
#include <linux/acpi.h>
#include <linux/pinctrl/consumer.h>
#include <linux/of_gpio.h>
#include <linux/version.h>
#include "sc760x_charger_mmi.h"
@ -902,6 +903,7 @@ static int sc760x_charger_get_property(struct power_supply *psy,
case POWER_SUPPLY_PROP_ONLINE:
val->intval = sc760x_is_enabled_charging(sc);
break;
case POWER_SUPPLY_PROP_PRESENT:
val->intval = sc->sc760x_enable;
@ -2067,8 +2069,11 @@ err_get_match:
return ret;
}
#if (KERNEL_VERSION(6, 1, 25) > LINUX_VERSION_CODE)
static int sc760x_charger_remove(struct i2c_client *client)
#else
static void sc760x_charger_remove(struct i2c_client *client)
#endif
{
struct sc760x_chip *sc = i2c_get_clientdata(client);
sc760x_remove_device_node(&(client->dev));
@ -2082,7 +2087,10 @@ static int sc760x_charger_remove(struct i2c_client *client)
power_supply_unregister(sc->charger_psy);
mutex_destroy(&sc->lock);
#if (KERNEL_VERSION(6, 1, 25) > LINUX_VERSION_CODE)
return 0;
#endif
}
#ifdef CONFIG_PM_SLEEP