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

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

Merge "soc: qcom: msm_bus: Fix compilation error with clang"

parents 669bf5a5 eb4b3732

drivers/soc/qcom/glink_debugfs.c

+3 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2016, 2019, 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
@@ -568,9 +568,9 @@ void glink_dfs_update_list(struct dentry *curr_dent, struct dentry *parent, 
			dbgfs_dent_s->parent = parent;

			dbgfs_dent_s->self = curr_dent;

			strlcpy(dbgfs_dent_s->self_name,

				curr, strlen(curr) + 1);

				curr, sizeof(dbgfs_dent_s->self_name));

			strlcpy(dbgfs_dent_s->par_name, par_dir,

					strlen(par_dir) + 1);

					sizeof(dbgfs_dent_s->par_name));

			INIT_WORK(&dbgfs_dent_s->rm_work,

				  glink_dfs_dent_rm_worker);

			mutex_lock(&dent_list_lock_lha0);

drivers/soc/qcom/msm_bus/msm_bus_dbg.c

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

/* Copyright (c) 2010-2012, 2014-2017, 2019 The Linux Foundation. All rights

 * reserved.

 *

 * This program is free software; you can redistribute it and/or modify
@@ -577,7 +577,6 @@ static ssize_t msm_bus_dbg_update_request_write(struct file *file, 
	list_for_each_entry(cldata, &cl_list, list) {

		if (strnstr(chid, cldata->pdata->name, cnt)) {

			found = 1;

			cldata = cldata;

			strsep(&chid, " ");

			if (chid) {

				ret = kstrtoul(chid, 10, &index);