diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-03-18 12:16:51 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-03-18 12:16:51 -0700 |
| commit | a635a6f9b10e501f55e9db4352e973c161a1f8e0 (patch) | |
| tree | c1f95eca3e7b8b70527648225a29dccc30cba895 /drivers/soc | |
| parent | 19b117fed94ff2164f761f9ad340706fa1a37815 (diff) | |
| parent | ac67229d0e34d4a21fd21d627b3e2744eadac254 (diff) | |
Merge "soc: qcom: hab: unify variable type to avoid implicit conversion"
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/qcom/hab/ghs_comm.c | 4 | ||||
| -rw-r--r-- | drivers/soc/qcom/hab/qvm_comm.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/soc/qcom/hab/ghs_comm.c b/drivers/soc/qcom/hab/ghs_comm.c index 825f33a23858..1fdb1668295c 100644 --- a/drivers/soc/qcom/hab/ghs_comm.c +++ b/drivers/soc/qcom/hab/ghs_comm.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, The Linux Foundation. All rights reserved. +/* Copyright (c) 2018-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 @@ -39,7 +39,7 @@ int physical_channel_send(struct physical_channel *pchan, struct hab_header *header, void *payload) { - int sizebytes = HAB_HEADER_GET_SIZE(*header); + size_t sizebytes = HAB_HEADER_GET_SIZE(*header); struct ghs_vdev *dev = (struct ghs_vdev *)pchan->hyp_data; GIPC_Result result; uint8_t *msg; diff --git a/drivers/soc/qcom/hab/qvm_comm.c b/drivers/soc/qcom/hab/qvm_comm.c index 25d0208dea4c..d5332bc38f83 100644 --- a/drivers/soc/qcom/hab/qvm_comm.c +++ b/drivers/soc/qcom/hab/qvm_comm.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved. +/* Copyright (c) 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 @@ -42,9 +42,9 @@ int physical_channel_send(struct physical_channel *pchan, struct hab_header *header, void *payload) { - int sizebytes = HAB_HEADER_GET_SIZE(*header); + size_t sizebytes = HAB_HEADER_GET_SIZE(*header); struct qvm_channel *dev = (struct qvm_channel *)pchan->hyp_data; - int total_size = sizeof(*header) + sizebytes; + size_t total_size = sizeof(*header) + sizebytes; if (total_size > dev->pipe_ep->tx_info.sh_buf->size) return -EINVAL; /* too much data for ring */ |