A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 12:58:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
qctecmdr 2020-02-14 08:25:42 -08:00 • committed by Gerrit - the friendly Code Review server
commit c11ae948db
1 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
drivers/char/adsprpc.c
View file

@ -306,8 +306,8 @@ struct fastrpc_static_pd {
struct notifier_block pdrnb;
struct notifier_block get_service_nb;
void *pdrhandle;
int pdrcount;
int prevpdrcount;
uint64_t pdrcount;
uint64_t prevpdrcount;
int ispdup;
int cid;
};
@ -329,10 +329,10 @@ struct fastrpc_channel_ctx {
struct notifier_block nb;
struct mutex smd_mutex;
struct mutex rpmsg_mutex;
int sesscount;
int ssrcount;
uint64_t sesscount;
uint64_t ssrcount;
void *handle;
int prevssrcount;
uint64_t prevssrcount;
int issubsystemup;
int vmid;
struct secure_vm rhvm;
@ -435,7 +435,7 @@ struct fastrpc_file {
int sessionid;
int tgid;
int cid;
int ssrcount;
uint64_t ssrcount;
int pd;
char *servloc_name;
int file_close;
@ -1318,7 +1318,7 @@ static int context_alloc(struct fastrpc_file *fl, uint32_t kernel,
struct smq_invoke_ctx *ctx = NULL;
struct fastrpc_ctx_lst *clst = &fl->clst;
struct fastrpc_ioctl_invoke *invoke = &invokefd->inv;
unsigned int cid;
int cid;
bufs = REMOTE_SCALARS_LENGTH(invoke->sc);
size = bufs * sizeof(*ctx->lpra) + bufs * sizeof(*ctx->maps) +
@ -3358,7 +3358,8 @@ static int fastrpc_session_alloc_locked(struct fastrpc_channel_ctx *chan,
int secure, struct fastrpc_session_ctx **session)
{
struct fastrpc_apps *me = &gfa;
int idx = 0, err = 0;
uint64_t idx = 0;
int err = 0;
if (chan->sesscount) {
for (idx = 0; idx < chan->sesscount; ++idx) {
@ -3652,13 +3653,13 @@ static ssize_t fastrpc_debugfs_read(struct file *filp, char __user *buffer,
len += scnprintf(fileinfo + len,
DEBUGFS_SIZE - len, "%-7s", chan->subsys);
len += scnprintf(fileinfo + len,
DEBUGFS_SIZE - len, "|%-10d",
DEBUGFS_SIZE - len, "|%-10u",
chan->sesscount);
len += scnprintf(fileinfo + len,
DEBUGFS_SIZE - len, "|%-14d",
chan->issubsystemup);
len += scnprintf(fileinfo + len,
DEBUGFS_SIZE - len, "|%-9d",
DEBUGFS_SIZE - len, "|%-9u",
chan->ssrcount);
for (j = 0; j < chan->sesscount; j++)
sess_used += chan->session[j].used;
@ -3709,7 +3710,7 @@ static ssize_t fastrpc_debugfs_read(struct file *filp, char __user *buffer,
len += scnprintf(fileinfo + len, DEBUGFS_SIZE - len,
"%s %7s %d\n", "sessionid", ":", fl->sessionid);
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,
"%s %14s %d\n", "pd", ":", fl->pd);
len += scnprintf(fileinfo + len, DEBUGFS_SIZE - len,
@ -4553,8 +4554,8 @@ static int fastrpc_cb_probe(struct device *dev)
struct fastrpc_session_ctx *sess;
struct of_phandle_args iommuspec;
const char *name;
int err = 0;
unsigned int sharedcb_count = 0, cid, i, j;
int err = 0, cid = -1, i = 0;
u32 sharedcb_count = 0, j = 0;
VERIFY(err, NULL != (name = of_get_property(dev->of_node,
"label", NULL)));