Merge "soc: qcom: Fix warnings in glink" (be7c1ced) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/rpmsg/qcom_glink_native.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -717,7 +717,7 @@ static int qcom_glink_advertise_intent(struct qcom_glink *glink,
		cmd.size = cpu_to_le32(intent->size);
		cmd.liid = cpu_to_le32(intent->id);

		CH_INFO(channel, "count:%d size:%d liid:%d\n", 1,
		CH_INFO(channel, "count:%d size:%zd liid:%d\n", 1,
		intent->size, intent->id);

		qcom_glink_tx(glink, &cmd, sizeof(cmd), NULL, 0, true);
		@@ -1024,7 +1024,8 @@ static void qcom_glink_handle_intent(struct qcom_glink *glink,
		intent->id = le32_to_cpu(msg->intents[i].iid);
		intent->size = le32_to_cpu(msg->intents[i].size);

		CH_INFO(channel, "riid:%d size:%d\n", intent->id, intent->size);
		CH_INFO(channel, "riid:%d size:%zd\n",
		intent->id, intent->size);

		spin_lock_irqsave(&channel->intent_lock, flags);
		ret = idr_alloc(&channel->riids, intent,
		@@ -1382,7 +1383,7 @@ static int qcom_glink_request_intent(struct qcom_glink *glink,
		cmd.cid = channel->lcid;
		cmd.size = size;

		CH_INFO(channel, "size:%d\n", size);
		CH_INFO(channel, "size:%zd\n", size);

		ret = qcom_glink_tx(glink, &cmd, sizeof(cmd), NULL, 0, true);
		if (ret)
		@@ -1863,7 +1864,7 @@ struct qcom_glink qcom_glink_native_probe(struct device dev,
		glink->task = kthread_run(kthread_worker_fn, &glink->kworker,
		"glink_%s", glink->name);
		if (IS_ERR(glink->task)) {
		dev_err(dev, "failed to spawn intent kthread %d\n",
		dev_err(dev, "failed to spawn intent kthread %ld\n",
		PTR_ERR(glink->task));
		return ERR_CAST(glink->task);
		}

drivers/soc/qcom/glink_pkt.c

+15 −14

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.
		*/

		#include <linux/platform_device.h>
		@@ -259,7 +259,7 @@ int glink_pkt_open(struct inode inode, struct file file)
		refcount_inc(&gpdev->refcount);
		get_device(dev);

		GLINK_PKT_INFO("begin for %s by %s:%ld ref_cnt[%d]\n",
		GLINK_PKT_INFO("begin for %s by %s:%d ref_cnt[%d]\n",
		gpdev->ch_name, current->comm,
		task_pid_nr(current), refcount_read(&gpdev->refcount));

		@@ -267,13 +267,13 @@ int glink_pkt_open(struct inode inode, struct file file)
		if (ret <= 0) {
		refcount_dec(&gpdev->refcount);
		put_device(dev);
		GLINK_PKT_INFO("timeout for %s by %s:%ld\n", gpdev->ch_name,
		GLINK_PKT_INFO("timeout for %s by %s:%d\n", gpdev->ch_name,
		current->comm, task_pid_nr(current));
		return -ETIMEDOUT;
		}
		file->private_data = gpdev;

		GLINK_PKT_INFO("end for %s by %s:%ld ref_cnt[%d]\n",
		GLINK_PKT_INFO("end for %s by %s:%d ref_cnt[%d]\n",
		gpdev->ch_name, current->comm,
		task_pid_nr(current), refcount_read(&gpdev->refcount));

		@@ -296,7 +296,7 @@ int glink_pkt_release(struct inode inode, struct file file)
		struct sk_buff *skb;
		unsigned long flags;

		GLINK_PKT_INFO("for %s by %s:%ld ref_cnt[%d]\n",
		GLINK_PKT_INFO("for %s by %s:%d ref_cnt[%d]\n",
		gpdev->ch_name, current->comm,
		task_pid_nr(current), refcount_read(&gpdev->refcount));

		@@ -339,7 +339,7 @@ ssize_t glink_pkt_read(struct file file, char __user buf,
		int use;

		if (!gpdev \|\| refcount_read(&gpdev->refcount) == 1) {
		GLINK_PKT_ERR("invalid device handle\n", __func__);
		GLINK_PKT_ERR("invalid device handle\n");
		return -EINVAL;
		}

		@@ -348,7 +348,7 @@ ssize_t glink_pkt_read(struct file file, char __user buf,
		return -ENETRESET;
		}

		GLINK_PKT_INFO("begin for %s by %s:%ld ref_cnt[%d]\n",
		GLINK_PKT_INFO("begin for %s by %s:%d ref_cnt[%d]\n",
		gpdev->ch_name, current->comm,
		task_pid_nr(current), refcount_read(&gpdev->refcount));

		@@ -384,7 +384,7 @@ ssize_t glink_pkt_read(struct file file, char __user buf,

		kfree_skb(skb);

		GLINK_PKT_INFO("end for %s by %s:%ld ret[%d]\n", gpdev->ch_name,
		GLINK_PKT_INFO("end for %s by %s:%d ret[%d]\n", gpdev->ch_name,
		current->comm, task_pid_nr(current), use);

		return use;
		@@ -410,7 +410,7 @@ ssize_t glink_pkt_write(struct file file, const char __user buf,

		gpdev = file->private_data;
		if (!gpdev \|\| refcount_read(&gpdev->refcount) == 1) {
		GLINK_PKT_ERR("invalid device handle\n", __func__);
		GLINK_PKT_ERR("invalid device handle\n");
		return -EINVAL;
		}

		@@ -460,7 +460,7 @@ static unsigned int glink_pkt_poll(struct file file, poll_table wait)

		gpdev = file->private_data;
		if (!gpdev \|\| refcount_read(&gpdev->refcount) == 1) {
		GLINK_PKT_ERR("invalid device handle\n", __func__);
		GLINK_PKT_ERR("invalid device handle\n");
		return POLLERR;
		}
		if (!completion_done(&gpdev->ch_open)) {
		@@ -555,7 +555,7 @@ static long glink_pkt_ioctl(struct file *file, unsigned int cmd,

		gpdev = file->private_data;
		if (!gpdev \|\| refcount_read(&gpdev->refcount) == 1) {
		GLINK_PKT_ERR("invalid device handle\n", __func__);
		GLINK_PKT_ERR("invalid device handle\n");
		return -EINVAL;
		}
		if (mutex_lock_interruptible(&gpdev->lock))
		@@ -824,8 +824,8 @@ static int glink_pkt_probe(struct platform_device *pdev)
		}
		glink_pkt_class = class_create(THIS_MODULE, "glinkpkt");
		if (IS_ERR(glink_pkt_class)) {
		GLINK_PKT_ERR("class_create failed ret:%d\n",
		PTR_ERR(glink_pkt_class));
		ret = PTR_ERR(glink_pkt_class);
		GLINK_PKT_ERR("class_create failed ret:%d\n", ret);
		goto error_deinit;
		}

		@@ -866,7 +866,8 @@ static int __init glink_pkt_init(void)

		ret = platform_driver_register(&glink_pkt_driver);
		if (ret) {
		GLINK_PKT_ERR("%s: glink_pkt register failed %d\n", ret);
		GLINK_PKT_ERR("%s: glink_pkt register failed %d\n",
		__func__, ret);
		return ret;
		}
		glink_pkt_ilctxt = ipc_log_context_create(GLINK_PKT_IPC_LOG_PAGE_CNT,

drivers/soc/qcom/glink_probe.c

+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/of.h>
		@@ -256,7 +256,7 @@ static int glink_probe_ssr_cb(struct notifier_block *this,
		{
		struct edge_info *einfo = container_of(this, struct edge_info, nb);

		GLINK_INFO("received %d for %s", code, einfo->ssr_label);
		GLINK_INFO("received %ld for %s\n", code, einfo->ssr_label);

		switch (code) {
		case SUBSYS_AFTER_POWERUP:

drivers/soc/qcom/qcom_ipcc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -163,7 +163,7 @@ qcom_ipcc_domain_xlate(struct irq_domain d, struct device_node node,
		*out_hwirq = qcom_ipcc_get_packed_id(intspec[0], intspec[1]);
		*out_type = intspec[2] & IRQ_TYPE_SENSE_MASK;

		dev_dbg(dev, "%s: hwirq: 0x%x\n", __func__, *out_hwirq);
		dev_dbg(dev, "%s: hwirq: 0x%lx\n", __func__, *out_hwirq);

		return 0;
		}

drivers/soc/qcom/service-notifier.c

+2 −2

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

		#define pr_fmt(fmt) "service-notifier: %s: " fmt, __func__
		@@ -519,7 +519,7 @@ static void add_service_notif(const char service_path, int instance_id,
		&server_ops,
		qmi_indication_handler);
		if (rc < 0) {
		pr_err("Service Notifier qmi handle init failed rc:%d\n", rc);
		pr_err("Service Notifier qmi handle init failed rc:%ld\n", rc);
		goto exit;
		}