Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb1cb0e8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers: msm: Remove all unused local variables"

parents 3e921e11 64dad28d

drivers/char/diag/diagfwd_peripheral.c

+0 −4
Original line number Diff line number Diff line
@@ -1049,7 +1049,6 @@ void diagfwd_close_transport(uint8_t transport, uint8_t peripheral) 
	void (*invalidate_fn)(void *, struct diagfwd_info *) = NULL;

	int (*check_channel_state)(void *) = NULL;

	uint8_t transport_open = 0;

	int i = 0;



	if (peripheral >= NUM_PERIPHERALS)

		return;
@@ -1258,7 +1257,6 @@ void diagfwd_close(uint8_t peripheral, uint8_t type) 


int diagfwd_channel_open(struct diagfwd_info *fwd_info)

{

	int i;



	if (!fwd_info)

		return -EIO;
@@ -1295,8 +1293,6 @@ int diagfwd_channel_open(struct diagfwd_info *fwd_info) 


int diagfwd_channel_close(struct diagfwd_info *fwd_info)

{

	int i;



	if (!fwd_info)

		return -EIO;

drivers/char/diag/diagfwd_rpmsg.c

+1 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -620,7 +620,6 @@ static struct diag_rpmsg_info *diag_get_rpmsg_ptr(char *name) 


static int diag_rpmsg_probe(struct rpmsg_device *rpdev)

{

	int err;

	struct diag_rpmsg_info *rpmsg_info = NULL;



	if (!rpdev)

drivers/char/diag/diagfwd_socket.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -451,7 +451,7 @@ static void socket_open_server(struct diag_socket_info *info) 
	ret = kernel_getsockname(info->hdl, (struct sockaddr *)&sq, &sl);

	if (ret < 0) {

		pr_err("diag: In %s, getsockname failed %d\n", __func__,

		       info->name, ret);

		       ret);

		sock_release(info->hdl);

		return;

	}

drivers/clk/qcom/clk-alpha-pll.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, 2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015, 2017-2018, The Linux Foundation. All rights reserved.

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and
@@ -1043,7 +1043,7 @@ static int clk_regera_pll_set_rate(struct clk_hw *hw, unsigned long rate, 
{

	struct clk_alpha_pll *pll = to_clk_alpha_pll(hw);

	unsigned long rrate;

	u32 regval, l, off = pll->offset;

	u32 l, off = pll->offset;

	u64 a;

	int ret;

drivers/clk/qcom/clk-cpu-osm.c

+0 −2
Original line number Diff line number Diff line
@@ -557,7 +557,6 @@ static int osm_cpufreq_cpu_init(struct cpufreq_policy *policy) 
	struct clk_hw *p_hw;

	int ret;

	unsigned int i;

	unsigned int xo_kHz;



	c = osm_configure_policy(policy);

	if (!c) {
@@ -965,7 +964,6 @@ static int clk_cpu_osm_driver_probe(struct platform_device *pdev) 
	u32 val;

	int num_clks = ARRAY_SIZE(osm_qcom_clk_hws);

	struct clk *clk;

	struct device *dev = &pdev->dev;

	struct clk_onecell_data *clk_data;

	struct cpu_cycle_counter_cb cycle_counter_cb = {

		.get_cpu_cycle_counter = clk_osm_get_cpu_cycle_counter,