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-07 12:25:00 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "input: qpnp-power-on: Fix the argument data-type for regmap_bulk_read"

Browse source
This commit is contained in:
qctecmdr 2020-09-19 09:09:15 -07:00 • committed by Gerrit - the friendly Code Review server
commit 8ccd500ed6
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
drivers/input/misc/qpnp-power-on.c
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
*/
#include <linux/debugfs.h>
@ -1983,7 +1983,8 @@ static void qpnp_pon_debugfs_remove(struct qpnp_pon *pon)
static int qpnp_pon_read_gen2_pon_off_reason(struct qpnp_pon *pon, u16 *reason,
int *reason_index_offset)
{
unsigned int buf[2], reg;
unsigned int reg, reg1;
u8 buf[2];
int rc;
rc = qpnp_pon_read(pon, QPNP_PON_OFF_REASON(pon), &reg);
@ -1991,10 +1992,10 @@ static int qpnp_pon_read_gen2_pon_off_reason(struct qpnp_pon *pon, u16 *reason,
return rc;
if (reg & QPNP_GEN2_POFF_SEQ) {
rc = qpnp_pon_read(pon, QPNP_POFF_REASON1(pon), buf);
rc = qpnp_pon_read(pon, QPNP_POFF_REASON1(pon), &reg1);
if (rc)
return rc;
*reason = (u8)buf[0];
*reason = (u8)reg1;
*reason_index_offset = 0;
} else if (reg & QPNP_GEN2_FAULT_SEQ) {
rc = regmap_bulk_read(pon->regmap, QPNP_FAULT_REASON1(pon), buf,
@ -2004,13 +2005,13 @@ static int qpnp_pon_read_gen2_pon_off_reason(struct qpnp_pon *pon, u16 *reason,
QPNP_FAULT_REASON1(pon), rc);
return rc;
}
*reason = (u8)buf[0] | (u16)(buf[1] << 8);
*reason = buf[0] | (u16)(buf[1] << 8);
*reason_index_offset = POFF_REASON_FAULT_OFFSET;
} else if (reg & QPNP_GEN2_S3_RESET_SEQ) {
rc = qpnp_pon_read(pon, QPNP_S3_RESET_REASON(pon), buf);
rc = qpnp_pon_read(pon, QPNP_S3_RESET_REASON(pon), &reg1);
if (rc)
return rc;
*reason = (u8)buf[0];
*reason = (u8)reg1;
*reason_index_offset = POFF_REASON_S3_RESET_OFFSET;
}
@ -2084,7 +2085,7 @@ static int qpnp_pon_read_hardware_info(struct qpnp_pon *pon, bool sys_reset)
{
struct device *dev = pon->dev;
unsigned int reg = 0;
unsigned int buf[2];
u8 buf[2];
int reason_index_offset = 0;
unsigned int pon_sts = 0;
bool cold_boot;
@ -2165,10 +2166,11 @@ static int qpnp_pon_read_hardware_info(struct qpnp_pon *pon, bool sys_reset)
QPNP_POFF_REASON1(pon), rc);
return rc;
}
poff_sts = buf[0] | (buf[1] << 8);
poff_sts = buf[0] | (u16)(buf[1] << 8);
}
index = ffs(poff_sts) - 1 + reason_index_offset;
if (index >= ARRAY_SIZE(qpnp_poff_reason) || index < 0) {
if (index >= ARRAY_SIZE(qpnp_poff_reason) || index < 0 ||
index < reason_index_offset) {
dev_info(dev, "PMIC@SID%d: Unknown power-off reason\n",
to_spmi_device(dev->parent)->usid);
} else {