summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm64/kernel/perf_trace_counters.c4
-rw-r--r--drivers/clk/msm/clock-cpu-8996.c2
-rw-r--r--drivers/clk/msm/mdss/mdss-dsi-pll-8996-util.c2
-rw-r--r--drivers/devfreq/governor_msm_adreno_tz.c3
-rw-r--r--drivers/input/qpnp-power-on.c2
-rw-r--r--drivers/iommu/arm-smmu.c2
-rw-r--r--drivers/iommu/iommu-debug.c2
-rw-r--r--drivers/leds/leds-qpnp-flash.c1
-rw-r--r--drivers/leds/leds-qpnp-wled.c2
-rw-r--r--drivers/misc/hdcp.c2
-rw-r--r--drivers/pci/host/pci-msm.c4
-rw-r--r--sound/soc/codecs/wcd-mbhc-v2.c26
-rw-r--r--sound/soc/codecs/wcd9xxx-common-v2.c10
13 files changed, 31 insertions, 31 deletions
diff --git a/arch/arm64/kernel/perf_trace_counters.c b/arch/arm64/kernel/perf_trace_counters.c
index ffcf3d00bd5d..748ad449fc18 100644
--- a/arch/arm64/kernel/perf_trace_counters.c
+++ b/arch/arm64/kernel/perf_trace_counters.c
@@ -60,8 +60,8 @@ static void setup_prev_cnts(u32 cpu, u32 cnten_val)
}
}
-void tracectr_notifier(void *ignore, struct task_struct *prev,
- struct task_struct *next)
+void tracectr_notifier(void *ignore, bool preempt,
+ struct task_struct *prev, struct task_struct *next)
{
u32 cnten_val;
int current_pid;
diff --git a/drivers/clk/msm/clock-cpu-8996.c b/drivers/clk/msm/clock-cpu-8996.c
index 3d7354e4c6f3..7c1200a8022d 100644
--- a/drivers/clk/msm/clock-cpu-8996.c
+++ b/drivers/clk/msm/clock-cpu-8996.c
@@ -664,7 +664,7 @@ static int cpu_clk_8996_set_rate(struct clk *c, unsigned long rate)
{
struct cpu_clk_8996 *cpuclk = to_cpu_clk_8996(c);
int ret, err_ret;
- unsigned long alt_pll_prev_rate;
+ unsigned long alt_pll_prev_rate = 0;
unsigned long alt_pll_rate;
unsigned long n_alt_freqs = cpuclk->n_alt_pll_freqs;
bool on_acd_leg = rate > MAX_PLL_MAIN_FREQ;
diff --git a/drivers/clk/msm/mdss/mdss-dsi-pll-8996-util.c b/drivers/clk/msm/mdss/mdss-dsi-pll-8996-util.c
index a46b1f275a33..47c4891d4449 100644
--- a/drivers/clk/msm/mdss/mdss-dsi-pll-8996-util.c
+++ b/drivers/clk/msm/mdss/mdss-dsi-pll-8996-util.c
@@ -317,7 +317,7 @@ init_lock_err:
static int dsi_pll_enable(struct clk *c)
{
- int i, rc;
+ int i, rc = 0;
struct dsi_pll_vco_clk *vco = to_vco_clk(c);
struct mdss_pll_resources *pll = vco->priv;
diff --git a/drivers/devfreq/governor_msm_adreno_tz.c b/drivers/devfreq/governor_msm_adreno_tz.c
index cb9925d4a823..9df1fde46068 100644
--- a/drivers/devfreq/governor_msm_adreno_tz.c
+++ b/drivers/devfreq/governor_msm_adreno_tz.c
@@ -267,7 +267,8 @@ static int tz_init(struct devfreq_msm_adreno_tz_data *priv,
return ret;
}
-static int tz_get_target_freq(struct devfreq *devfreq, unsigned long *freq)
+static int tz_get_target_freq(struct devfreq *devfreq, unsigned long *freq,
+ u32 *flag)
{
int result = 0;
struct devfreq_msm_adreno_tz_data *priv = devfreq->data;
diff --git a/drivers/input/qpnp-power-on.c b/drivers/input/qpnp-power-on.c
index 06b3fe5f27a6..6f310a54d172 100644
--- a/drivers/input/qpnp-power-on.c
+++ b/drivers/input/qpnp-power-on.c
@@ -1704,7 +1704,7 @@ static bool smpl_en;
static int qpnp_pon_smpl_en_get(char *buf, const struct kernel_param *kp)
{
- bool enabled;
+ bool enabled = 0;
int rc;
rc = qpnp_pon_get_trigger_config(PON_SMPL, &enabled);
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 21732857bac0..a146a225dc18 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -3209,7 +3209,7 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu)
"\t(IDR0.CTTW overridden by dma-coherent property)\n");
if (id & ID0_SMS) {
- u32 smr, sid, mask;
+ u32 smr, sid, mask = 0;
smmu->features |= ARM_SMMU_FEAT_STREAM_MATCH;
smmu->num_mapping_groups = (id >> ID0_NUMSMRG_SHIFT) &
diff --git a/drivers/iommu/iommu-debug.c b/drivers/iommu/iommu-debug.c
index 9fbdb4acd5d7..dece6cbb9441 100644
--- a/drivers/iommu/iommu-debug.c
+++ b/drivers/iommu/iommu-debug.c
@@ -943,7 +943,7 @@ static ssize_t iommu_debug_unmap_write(struct file *file,
const char __user *ubuf,
size_t count, loff_t *offset)
{
- ssize_t retval;
+ ssize_t retval = 0;
char *comma1;
char buf[100];
dma_addr_t iova;
diff --git a/drivers/leds/leds-qpnp-flash.c b/drivers/leds/leds-qpnp-flash.c
index f0ebe694a9ec..3eb794b30b4b 100644
--- a/drivers/leds/leds-qpnp-flash.c
+++ b/drivers/leds/leds-qpnp-flash.c
@@ -118,7 +118,6 @@
#define FLASH_LED_MODULE_CTRL_DEFAULT 0x60
#define FLASH_LED_CURRENT_READING_DELAY_MIN 5000
#define FLASH_LED_CURRENT_READING_DELAY_MAX 5001
-#define PMI8996_SUBTYPE 19
#define FLASH_LED_OPEN_FAULT_DETECTED 0xC
#define FLASH_UNLOCK_SECURE 0xA5
diff --git a/drivers/leds/leds-qpnp-wled.c b/drivers/leds/leds-qpnp-wled.c
index a7a25f54f992..ffaa349d56f5 100644
--- a/drivers/leds/leds-qpnp-wled.c
+++ b/drivers/leds/leds-qpnp-wled.c
@@ -1621,7 +1621,7 @@ static int qpnp_wled_parse_dt(struct qpnp_wled *wled)
static int qpnp_wled_probe(struct platform_device *pdev)
{
struct qpnp_wled *wled;
- int rc, i;
+ int rc = 0, i;
const __be32 *prop;
wled = devm_kzalloc(&pdev->dev, sizeof(*wled), GFP_KERNEL);
diff --git a/drivers/misc/hdcp.c b/drivers/misc/hdcp.c
index 18265fd80726..b6675fcbaaaa 100644
--- a/drivers/misc/hdcp.c
+++ b/drivers/misc/hdcp.c
@@ -1114,7 +1114,7 @@ static void hdcp_lib_msg_recvd_work(struct kthread_work *work)
struct hdcp_rcvd_msg_req *req_buf;
struct hdcp_rcvd_msg_rsp *rsp_buf;
uint32_t msglen;
- char *msg;
+ char *msg = NULL;
struct hdcp_lib_handle *handle = container_of(work,
struct hdcp_lib_handle, msg_recvd);
struct hdmi_hdcp_wakeup_data cdata = {HDMI_HDCP_WKUP_CMD_INVALID};
diff --git a/drivers/pci/host/pci-msm.c b/drivers/pci/host/pci-msm.c
index 6cc725c322ec..b10215a4537a 100644
--- a/drivers/pci/host/pci-msm.c
+++ b/drivers/pci/host/pci-msm.c
@@ -2235,7 +2235,7 @@ int msm_pcie_debug_info(struct pci_dev *dev, u32 option, u32 base,
u32 offset, u32 mask, u32 value)
{
int ret = 0;
- struct msm_pcie_dev_t *pdev;
+ struct msm_pcie_dev_t *pdev = NULL;
if (!dev) {
pr_err("PCIe: the input pci dev is NULL.\n");
@@ -4886,7 +4886,7 @@ static irqreturn_t handle_global_irq(int irq, void *data)
int i;
struct msm_pcie_dev_t *dev = data;
unsigned long irqsave_flags;
- u32 status;
+ u32 status = 0;
PCIE_DBG2(dev, "RC%d: Global IRQ %d received: 0x%x\n",
dev->rc_idx, irq, status);
diff --git a/sound/soc/codecs/wcd-mbhc-v2.c b/sound/soc/codecs/wcd-mbhc-v2.c
index eceefee0a4a0..f8499d1e0763 100644
--- a/sound/soc/codecs/wcd-mbhc-v2.c
+++ b/sound/soc/codecs/wcd-mbhc-v2.c
@@ -235,7 +235,7 @@ static int wcd_event_notify(struct notifier_block *self, unsigned long val,
struct snd_soc_codec *codec = mbhc->codec;
bool micbias2 = false;
bool micbias1 = false;
- u8 fsm_en;
+ u8 fsm_en = 0;
pr_debug("%s: event %s (%d)\n", __func__,
wcd_mbhc_get_event_string(event), event);
@@ -406,7 +406,7 @@ static int wcd_cancel_btn_work(struct wcd_mbhc *mbhc)
static bool wcd_swch_level_remove(struct wcd_mbhc *mbhc)
{
- u16 result2;
+ u16 result2 = 0;
WCD_MBHC_REG_READ(WCD_MBHC_SWCH_LEVEL_REMOVE, result2);
return (result2) ? true : false;
@@ -441,7 +441,7 @@ static void wcd_cancel_hs_detect_plug(struct wcd_mbhc *mbhc,
static void wcd_mbhc_clr_and_turnon_hph_padac(struct wcd_mbhc *mbhc)
{
bool pa_turned_on = false;
- u8 wg_time;
+ u8 wg_time = 0;
WCD_MBHC_REG_READ(WCD_MBHC_HPH_CNP_WG_TIME, wg_time);
wg_time += 1;
@@ -481,7 +481,7 @@ static bool wcd_mbhc_is_hph_pa_on(struct wcd_mbhc *mbhc)
static void wcd_mbhc_set_and_turnoff_hph_padac(struct wcd_mbhc *mbhc)
{
- u8 wg_time;
+ u8 wg_time = 0;
WCD_MBHC_REG_READ(WCD_MBHC_HPH_CNP_WG_TIME, wg_time);
wg_time += 1;
@@ -726,10 +726,10 @@ exit:
/* To determine if cross connection occured */
static int wcd_check_cross_conn(struct wcd_mbhc *mbhc)
{
- u16 swap_res;
+ u16 swap_res = 0;
enum wcd_mbhc_plug_type plug_type = MBHC_PLUG_TYPE_NONE;
- s16 reg1;
- bool hphl_sch_res, hphr_sch_res;
+ s16 reg1 = 0;
+ bool hphl_sch_res = 0, hphr_sch_res = 0;
if (wcd_swch_level_remove(mbhc)) {
pr_debug("%s: Switch level is low\n", __func__);
@@ -928,7 +928,7 @@ static void wcd_correct_swch_plug(struct work_struct *work)
struct snd_soc_codec *codec;
enum wcd_mbhc_plug_type plug_type = MBHC_PLUG_TYPE_INVALID;
unsigned long timeout;
- u16 hs_comp_res, hphl_sch, mic_sch, btn_result;
+ u16 hs_comp_res = 0, hphl_sch = 0, mic_sch = 0, btn_result = 0;
bool wrk_complete = false;
int pt_gnd_mic_swap_cnt = 0;
int no_gnd_mic_swap_cnt = 0;
@@ -1218,7 +1218,7 @@ static void wcd_mbhc_detect_plug_type(struct wcd_mbhc *mbhc)
static void wcd_mbhc_swch_irq_handler(struct wcd_mbhc *mbhc)
{
- bool detection_type;
+ bool detection_type = 0;
bool micbias1 = false;
struct snd_soc_codec *codec = mbhc->codec;
@@ -1389,8 +1389,8 @@ static int wcd_mbhc_get_button_mask(struct wcd_mbhc *mbhc)
static irqreturn_t wcd_mbhc_hs_ins_irq(int irq, void *data)
{
struct wcd_mbhc *mbhc = data;
- bool detection_type, hphl_sch, mic_sch;
- u16 elect_result;
+ bool detection_type = 0, hphl_sch = 0, mic_sch = 0;
+ u16 elect_result = 0;
static u16 hphl_trigerred;
static u16 mic_trigerred;
@@ -1471,7 +1471,7 @@ determine_plug:
static irqreturn_t wcd_mbhc_hs_rem_irq(int irq, void *data)
{
struct wcd_mbhc *mbhc = data;
- u8 hs_comp_result, hphl_sch, mic_sch;
+ u8 hs_comp_result = 0, hphl_sch = 0, mic_sch = 0;
static u16 hphl_trigerred;
static u16 mic_trigerred;
unsigned long timeout;
@@ -1583,7 +1583,7 @@ static void wcd_btn_lpress_fn(struct work_struct *work)
{
struct delayed_work *dwork;
struct wcd_mbhc *mbhc;
- s16 btn_result;
+ s16 btn_result = 0;
pr_debug("%s: Enter\n", __func__);
diff --git a/sound/soc/codecs/wcd9xxx-common-v2.c b/sound/soc/codecs/wcd9xxx-common-v2.c
index 295f0b31855d..301cf5cf42c4 100644
--- a/sound/soc/codecs/wcd9xxx-common-v2.c
+++ b/sound/soc/codecs/wcd9xxx-common-v2.c
@@ -256,7 +256,7 @@ static void wcd_clsh_flyback_ctrl(struct snd_soc_codec *codec,
static void wcd_clsh_set_gain_path(struct snd_soc_codec *codec,
int mode)
{
- u8 val;
+ u8 val = 0;
struct wcd9xxx *wcd9xxx = dev_get_drvdata(codec->dev->parent);
if (!TASHA_IS_2_0(wcd9xxx->version))
@@ -281,8 +281,8 @@ static void wcd_clsh_set_gain_path(struct snd_soc_codec *codec,
static void wcd_clsh_set_hph_mode(struct snd_soc_codec *codec,
int mode)
{
- u8 val;
- u8 gain;
+ u8 val = 0;
+ u8 gain = 0;
u8 res_val = VREF_FILT_R_0OHM;
struct wcd9xxx *wcd9xxx = dev_get_drvdata(codec->dev->parent);
@@ -373,7 +373,7 @@ static void wcd_clsh_state_hph_ear(struct snd_soc_codec *codec,
struct wcd_clsh_cdc_data *clsh_d,
u8 req_state, bool is_enable, int mode)
{
- int hph_mode;
+ int hph_mode = 0;
dev_dbg(codec->dev, "%s: mode: %s, %s\n", __func__, mode_to_str(mode),
is_enable ? "enable" : "disable");
@@ -516,7 +516,7 @@ static void wcd_clsh_state_hph_lo(struct snd_soc_codec *codec,
struct wcd_clsh_cdc_data *clsh_d,
u8 req_state, bool is_enable, int mode)
{
- int hph_mode;
+ int hph_mode = 0;
dev_dbg(codec->dev, "%s: mode: %s, %s\n", __func__, mode_to_str(mode),
is_enable ? "enable" : "disable");