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

Commit cbe74cd8 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "adsprpc: use uint for counters and maintain consistency in datatypes"

parents a0870ccd e058ef0a

drivers/char/adsprpc.c

+14 −13
Original line number Original line Diff line number Diff line
@@ -315,8 +315,8 @@ struct fastrpc_static_pd { 
	struct notifier_block pdrnb;

	struct notifier_block pdrnb;

	struct notifier_block get_service_nb;

	struct notifier_block get_service_nb;

	void *pdrhandle;

	void *pdrhandle;

	int pdrcount;

	uint64_t pdrcount;

	int prevpdrcount;

	uint64_t prevpdrcount;

	int ispdup;

	int ispdup;

	int cid;

	int cid;

};

};
@@ -338,10 +338,10 @@ struct fastrpc_channel_ctx { 
	struct notifier_block nb;

	struct notifier_block nb;

	struct mutex smd_mutex;

	struct mutex smd_mutex;

	struct mutex rpmsg_mutex;

	struct mutex rpmsg_mutex;

	int sesscount;

	uint64_t sesscount;

	int ssrcount;

	uint64_t ssrcount;

	void *handle;

	void *handle;

	int prevssrcount;

	uint64_t prevssrcount;

	int issubsystemup;

	int issubsystemup;

	int vmid;

	int vmid;

	struct secure_vm rhvm;

	struct secure_vm rhvm;
@@ -442,7 +442,7 @@ struct fastrpc_file { 
	int sessionid;

	int sessionid;

	int tgid;

	int tgid;

	int cid;

	int cid;

	int ssrcount;

	uint64_t ssrcount;

	int pd;

	int pd;

	char *servloc_name;

	char *servloc_name;

	int file_close;

	int file_close;
@@ -1307,7 +1307,7 @@ static int context_alloc(struct fastrpc_file *fl, uint32_t kernel, 
	struct smq_invoke_ctx *ctx = NULL;

	struct smq_invoke_ctx *ctx = NULL;

	struct fastrpc_ctx_lst *clst = &fl->clst;

	struct fastrpc_ctx_lst *clst = &fl->clst;

	struct fastrpc_ioctl_invoke *invoke = &invokefd->inv;

	struct fastrpc_ioctl_invoke *invoke = &invokefd->inv;

	unsigned int cid;

	int cid;





	bufs = REMOTE_SCALARS_LENGTH(invoke->sc);

	bufs = REMOTE_SCALARS_LENGTH(invoke->sc);

	size = bufs * sizeof(*ctx->lpra) + bufs * sizeof(*ctx->maps) +

	size = bufs * sizeof(*ctx->lpra) + bufs * sizeof(*ctx->maps) +
@@ -3285,7 +3285,8 @@ static int fastrpc_session_alloc_locked(struct fastrpc_channel_ctx *chan, 
			int secure, struct fastrpc_session_ctx **session)

			int secure, struct fastrpc_session_ctx **session)

{

{

	struct fastrpc_apps *me = &gfa;

	struct fastrpc_apps *me = &gfa;

	int idx = 0, err = 0;

	uint64_t idx = 0;

	int err = 0;





	if (chan->sesscount) {

	if (chan->sesscount) {

		for (idx = 0; idx < chan->sesscount; ++idx) {

		for (idx = 0; idx < chan->sesscount; ++idx) {
@@ -3603,13 +3604,13 @@ static ssize_t fastrpc_debugfs_read(struct file *filp, char __user *buffer, 
			len += scnprintf(fileinfo + len,

			len += scnprintf(fileinfo + len,

				DEBUGFS_SIZE - len, "%-7s", chan->subsys);

				DEBUGFS_SIZE - len, "%-7s", chan->subsys);

			len += scnprintf(fileinfo + len,

			len += scnprintf(fileinfo + len,

				DEBUGFS_SIZE - len, "|%-10d",

				DEBUGFS_SIZE - len, "|%-10u",

				chan->sesscount);

				chan->sesscount);

			len += scnprintf(fileinfo + len,

			len += scnprintf(fileinfo + len,

				DEBUGFS_SIZE - len, "|%-14d",

				DEBUGFS_SIZE - len, "|%-14d",

				chan->issubsystemup);

				chan->issubsystemup);

			len += scnprintf(fileinfo + len,

			len += scnprintf(fileinfo + len,

				DEBUGFS_SIZE - len, "|%-9d",

				DEBUGFS_SIZE - len, "|%-9u",

				chan->ssrcount);

				chan->ssrcount);

			for (j = 0; j < chan->sesscount; j++) {

			for (j = 0; j < chan->sesscount; j++) {

				sess_used += chan->session[j].used;

				sess_used += chan->session[j].used;
@@ -3665,7 +3666,7 @@ static ssize_t fastrpc_debugfs_read(struct file *filp, char __user *buffer, 
		len += scnprintf(fileinfo + len, DEBUGFS_SIZE - len,

		len += scnprintf(fileinfo + len, DEBUGFS_SIZE - len,

			"%s %7s %d\n", "sessionid", ":", fl->sessionid);

			"%s %7s %d\n", "sessionid", ":", fl->sessionid);

		len += scnprintf(fileinfo + len, DEBUGFS_SIZE - len,

		len += scnprintf(fileinfo + len, DEBUGFS_SIZE - len,

			"%s %8s %d\n", "ssrcount", ":", fl->ssrcount);

			"%s %8s %u\n", "ssrcount", ":", fl->ssrcount);

		len += scnprintf(fileinfo + len, DEBUGFS_SIZE - len,

		len += scnprintf(fileinfo + len, DEBUGFS_SIZE - len,

			"%s %14s %d\n", "pd", ":", fl->pd);

			"%s %14s %d\n", "pd", ":", fl->pd);

		len += scnprintf(fileinfo + len, DEBUGFS_SIZE - len,

		len += scnprintf(fileinfo + len, DEBUGFS_SIZE - len,
@@ -4482,8 +4483,8 @@ static int fastrpc_cb_probe(struct device *dev) 
	struct fastrpc_session_ctx *sess;

	struct fastrpc_session_ctx *sess;

	struct of_phandle_args iommuspec;

	struct of_phandle_args iommuspec;

	const char *name;

	const char *name;

	int err = 0;

	int err = 0, cid = -1, i = 0;

	unsigned int sharedcb_count = 0, cid, i, j;

	u32 sharedcb_count = 0, j = 0;





	VERIFY(err, NULL != (name = of_get_property(dev->of_node,

	VERIFY(err, NULL != (name = of_get_property(dev->of_node,

					 "label", NULL)));

					 "label", NULL)));