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-08 21:22:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Power: fix implicit bld errs of wakeup_source API's

Browse source 
fix implicit bld errs of wakeup_source API's in Android R

On latest kernel rebase from QC:

we see couple of wakeup_source API's are removed,

errors as below:

motorola/kernel/modules/drivers/power/qpnp-smbcharger-mmi/qpnp-smbcharger-mmi.c:4120:2: error: implicit declaration of function 'wakeup_source_init' [-Werror,-Wimplicit-function-declaration]
motorola/kernel/modules/drivers/power/qpnp-smbcharger-mmi/qpnp-smbcharger-mmi.c:4443:2: error: implicit declaration of function 'wakeup_source_trash' [-Werror,-Wimplicit-function-declaration]

motorola/kernel/modules/drivers/power/p938x_charger/p938x_charger.c:2945:2: error: implicit declaration of function 'wakeup_source_init' [-Werror,-Wimplicit-function-declaration]
        wakeup_source_init(&chip->wls_wake_source, "p938x wireless charger");
motorola/kernel/modules/drivers/power/p938x_charger/p938x_charger.c:3015:2: error: implicit declaration of function 'wakeup_source_trash' [-Werror,-Wimplicit-function-declaration]
        wakeup_source_trash(&chip->wls_wake_source);

This fix replaces

1) wakeup_source_init(..) function with to wakeup_source_register(..)
2) wakeup_source_trash(..) function with to wakeup_source_unregister(..)

Change-Id: I9639f64ad8f9efeaf8f3d199f9a2af27341b145b
Signed-off-by: kumarv <kumarv@motorola.com>
This commit is contained in:
kumarv 2020-07-09 15:40:11 +05:30 • committed by a7301c
commit ca6f40eab7
2 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
drivers/power/p938x_charger/p938x_charger.c
View file

@ -303,7 +303,7 @@ struct p938x_charger {
unsigned long flags;
struct wakeup_source wls_wake_source;
struct wakeup_source *wls_wake_source;
bool epp_mode;
u32 bpp_current_limit;
@ -391,10 +391,10 @@ static void p938x_reset(struct p938x_charger *chip)
static void p938x_pm_set_awake(struct p938x_charger *chip, int awake)
{
if(!test_bit(WLS_FLAG_KEEP_AWAKE, &chip->flags) && awake) {
__pm_stay_awake(&chip->wls_wake_source);
__pm_stay_awake(chip->wls_wake_source);
set_bit(WLS_FLAG_KEEP_AWAKE, &chip->flags);
} else if(test_bit(WLS_FLAG_KEEP_AWAKE, &chip->flags) && !awake) {
__pm_relax(&chip->wls_wake_source);
__pm_relax(chip->wls_wake_source);
clear_bit(WLS_FLAG_KEEP_AWAKE, &chip->flags);
}
}
@ -2942,7 +2942,13 @@ static int p938x_charger_probe(struct i2c_client *client,
mutex_init(&chip->disconnect_lock);
mutex_init(&chip->txmode_lock);
wakeup_source_init(&chip->wls_wake_source, "p938x wireless charger");
chip->wls_wake_source = wakeup_source_register(chip->dev, "p938x wireless charger");
if (!chip->wls_wake_source) {
p938x_err(chip, "failed to allocate wakeup source\n");
rc = -ENOMEM;
goto free_psy;
}
/* In case we are already powered on */
p938x_check_status(chip);
@ -3012,7 +3018,7 @@ static int p938x_charger_remove(struct i2c_client *client)
{
struct p938x_charger *chip = i2c_get_clientdata(client);
wakeup_source_trash(&chip->wls_wake_source);
wakeup_source_unregister(chip->wls_wake_source);
sysfs_remove_groups(&chip->dev->kobj, p938x_groups);
cancel_delayed_work_sync(&chip->heartbeat_work);
cancel_delayed_work_sync(&chip->tx_mode_work);

17
drivers/power/qpnp-smbcharger-mmi/qpnp-smbcharger-mmi.c
View file

@ -372,7 +372,7 @@ struct smb_mmi_charger {
struct mmi_sm_params sm_param[3];
int base_fv_mv;
int vfloat_comp_mv;
struct wakeup_source smb_mmi_hb_wake_source;
struct wakeup_source *smb_mmi_hb_wake_source;
struct alarm heartbeat_alarm;
int suspended;
bool awake;
@ -2243,7 +2243,7 @@ static enum alarmtimer_restart mmi_heartbeat_alarm_cb(struct alarm *alarm,
mmi_dbg(chip, "HB alarm fired\n");
__pm_stay_awake(&chip->smb_mmi_hb_wake_source);
__pm_stay_awake(chip->smb_mmi_hb_wake_source);
cancel_delayed_work(&chip->heartbeat_work);
/* Delay by 500 ms to allow devices to resume. */
schedule_delayed_work(&chip->heartbeat_work,
@ -3430,7 +3430,7 @@ sch_hb:
kfree(chrg_rate_string);
__pm_relax(&chip->smb_mmi_hb_wake_source);
__pm_relax(chip->smb_mmi_hb_wake_source);
}
static int mmi_psy_notifier_call(struct notifier_block *nb, unsigned long val,
@ -4121,8 +4121,13 @@ static int smb_mmi_probe(struct platform_device *pdev)
INIT_DELAYED_WORK(&chip->heartbeat_work, mmi_heartbeat_work);
INIT_DELAYED_WORK(&chip->weakcharger_work, mmi_weakcharger_work);
wakeup_source_init(&chip->smb_mmi_hb_wake_source,
"smb_mmi_hb_wake");
chip->smb_mmi_hb_wake_source = wakeup_source_register(chip->dev, "smb_mmi_hb_wake");
if (!chip->smb_mmi_hb_wake_source) {
mmi_err(chip, "failed to allocate wakeup source\n");
return -ENOMEM;
}
alarm_init(&chip->heartbeat_alarm, ALARM_BOOTTIME,
mmi_heartbeat_alarm_cb);
@ -4444,7 +4449,7 @@ static void smb_mmi_shutdown(struct platform_device *pdev)
if (chip->max_flip_psy)
power_supply_put(chip->max_flip_psy);
wakeup_source_trash(&chip->smb_mmi_hb_wake_source);
wakeup_source_unregister(chip->smb_mmi_hb_wake_source);
return;
}