Merge "msm: ipa: Fix compiler warnings" (cbf3af76) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/platform/msm/ipa/ipa_v3/ipa_mhi_proxy.c

+2 −1

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2018, The Linux Foundation. All rights reserved.
		* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
		*/

		#include <linux/dma-mapping.h>
		@@ -902,6 +902,7 @@ static void imp_mhi_status_cb(struct mhi_device *mhi_dev, enum MHI_CB mhi_cb)

		case MHI_CB_EE_RDDM:
		case MHI_CB_PENDING_DATA:
		default:
		IMP_ERR("unexpected event %d\n", mhi_cb);
		break;
		}

+2 −2

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
		* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
		*/

		#include <linux/mutex.h>
		@@ -852,7 +852,7 @@ static ssize_t ipa_ut_dbgfs_enable_write(struct file *file,

		IPA_UT_DBG("Entry\n");

		if (sizeof(lcl_buf) < count + 1) {
		if (count >= sizeof(lcl_buf)) {
		IPA_UT_ERR("No enough space\n");
		return -E2BIG;
		}

+3 −3

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.
		* Copyright (c) 2014-2019, The Linux Foundation. All rights reserved.
		*/

		#define pr_fmt(fmt) "%s: " fmt, __func__
		@@ -1533,7 +1533,7 @@ static int qpnp_lab_rdson_nfet_config(struct qpnp_labibb *labibb, u32 tmp)
		return -EINVAL;
		}

		val \|= (i << LAB_RDSON_MNGMNT_NFET_SHIFT) \|
		val = (i << LAB_RDSON_MNGMNT_NFET_SHIFT) \|
		LAB_RDSON_MNGMNT_NFET_SLEW_EN;
		mask = LAB_RDSON_MNGMNT_NFET_MASK \| LAB_RDSON_MNGMNT_NFET_SLEW_EN;
		rc = qpnp_labibb_masked_write(labibb, labibb->lab_base +
		@@ -3803,7 +3803,7 @@ static struct regulator_ops qpnp_ibb_ops = {
		.get_voltage = qpnp_ibb_regulator_get_voltage,
		};

		static qpnp_ibb_get_current_voltage(struct qpnp_labibb *labibb,
		static int qpnp_ibb_get_current_voltage(struct qpnp_labibb *labibb,
		struct device_node *of_node)
		{
		int rc;