mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
crypto: sun4i-ss - Fix 64-bit size_t warnings on sun4i-ss-hash.c
If you try to compile this driver on a 64-bit platform then you will get warnings because it mixes size_t with unsigned int which only works on 32-bit. This patch fixes all of the warnings on sun4i-ss-hash.c. Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
parent
a30583fcfb
commit
a7126603d4
1 changed files with 6 additions and 6 deletions
|
@ -284,8 +284,8 @@ static int sun4i_hash(struct ahash_request *areq)
|
||||||
*/
|
*/
|
||||||
while (op->len < 64 && i < end) {
|
while (op->len < 64 && i < end) {
|
||||||
/* how many bytes we can read from current SG */
|
/* how many bytes we can read from current SG */
|
||||||
in_r = min3(mi.length - in_i, end - i,
|
in_r = min(end - i, 64 - op->len);
|
||||||
64 - op->len);
|
in_r = min_t(size_t, mi.length - in_i, in_r);
|
||||||
memcpy(op->buf + op->len, mi.addr + in_i, in_r);
|
memcpy(op->buf + op->len, mi.addr + in_i, in_r);
|
||||||
op->len += in_r;
|
op->len += in_r;
|
||||||
i += in_r;
|
i += in_r;
|
||||||
|
@ -305,8 +305,8 @@ static int sun4i_hash(struct ahash_request *areq)
|
||||||
}
|
}
|
||||||
if (mi.length - in_i > 3 && i < end) {
|
if (mi.length - in_i > 3 && i < end) {
|
||||||
/* how many bytes we can read from current SG */
|
/* how many bytes we can read from current SG */
|
||||||
in_r = min3(mi.length - in_i, areq->nbytes - i,
|
in_r = min_t(size_t, mi.length - in_i, areq->nbytes - i);
|
||||||
((mi.length - in_i) / 4) * 4);
|
in_r = min_t(size_t, ((mi.length - in_i) / 4) * 4, in_r);
|
||||||
/* how many bytes we can write in the device*/
|
/* how many bytes we can write in the device*/
|
||||||
todo = min3((u32)(end - i) / 4, rx_cnt, (u32)in_r / 4);
|
todo = min3((u32)(end - i) / 4, rx_cnt, (u32)in_r / 4);
|
||||||
writesl(ss->base + SS_RXFIFO, mi.addr + in_i, todo);
|
writesl(ss->base + SS_RXFIFO, mi.addr + in_i, todo);
|
||||||
|
@ -332,8 +332,8 @@ static int sun4i_hash(struct ahash_request *areq)
|
||||||
if ((areq->nbytes - i) < 64) {
|
if ((areq->nbytes - i) < 64) {
|
||||||
while (i < areq->nbytes && in_i < mi.length && op->len < 64) {
|
while (i < areq->nbytes && in_i < mi.length && op->len < 64) {
|
||||||
/* how many bytes we can read from current SG */
|
/* how many bytes we can read from current SG */
|
||||||
in_r = min3(mi.length - in_i, areq->nbytes - i,
|
in_r = min(areq->nbytes - i, 64 - op->len);
|
||||||
64 - op->len);
|
in_r = min_t(size_t, mi.length - in_i, in_r);
|
||||||
memcpy(op->buf + op->len, mi.addr + in_i, in_r);
|
memcpy(op->buf + op->len, mi.addr + in_i, in_r);
|
||||||
op->len += in_r;
|
op->len += in_r;
|
||||||
i += in_r;
|
i += in_r;
|
||||||
|
|
Loading…
Reference in a new issue