|
@@ -184,7 +184,7 @@ static int atmel_aes_sg_length(struct ablkcipher_request *req,
|
|
|
static int atmel_aes_sg_copy(struct scatterlist **sg, size_t *offset,
|
|
|
void *buf, size_t buflen, size_t total, int out)
|
|
|
{
|
|
|
- unsigned int count, off = 0;
|
|
|
+ size_t count, off = 0;
|
|
|
|
|
|
while (buflen && total) {
|
|
|
count = min((*sg)->length - *offset, total);
|
|
@@ -444,8 +444,8 @@ static int atmel_aes_crypt_dma_start(struct atmel_aes_dev *dd)
|
|
|
|
|
|
|
|
|
if (fast) {
|
|
|
- count = min(dd->total, sg_dma_len(dd->in_sg));
|
|
|
- count = min(count, sg_dma_len(dd->out_sg));
|
|
|
+ count = min_t(size_t, dd->total, sg_dma_len(dd->in_sg));
|
|
|
+ count = min_t(size_t, count, sg_dma_len(dd->out_sg));
|
|
|
|
|
|
err = dma_map_sg(dd->dev, dd->in_sg, 1, DMA_TO_DEVICE);
|
|
|
if (!err) {
|
|
@@ -639,7 +639,7 @@ static int atmel_aes_crypt_dma_stop(struct atmel_aes_dev *dd)
|
|
|
dd->buf_out, dd->buflen, dd->dma_size, 1);
|
|
|
if (count != dd->dma_size) {
|
|
|
err = -EINVAL;
|
|
|
- pr_err("not all data converted: %u\n", count);
|
|
|
+ pr_err("not all data converted: %zu\n", count);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -666,7 +666,7 @@ static int atmel_aes_buff_init(struct atmel_aes_dev *dd)
|
|
|
dd->dma_addr_in = dma_map_single(dd->dev, dd->buf_in,
|
|
|
dd->buflen, DMA_TO_DEVICE);
|
|
|
if (dma_mapping_error(dd->dev, dd->dma_addr_in)) {
|
|
|
- dev_err(dd->dev, "dma %d bytes error\n", dd->buflen);
|
|
|
+ dev_err(dd->dev, "dma %zd bytes error\n", dd->buflen);
|
|
|
err = -EINVAL;
|
|
|
goto err_map_in;
|
|
|
}
|
|
@@ -674,7 +674,7 @@ static int atmel_aes_buff_init(struct atmel_aes_dev *dd)
|
|
|
dd->dma_addr_out = dma_map_single(dd->dev, dd->buf_out,
|
|
|
dd->buflen, DMA_FROM_DEVICE);
|
|
|
if (dma_mapping_error(dd->dev, dd->dma_addr_out)) {
|
|
|
- dev_err(dd->dev, "dma %d bytes error\n", dd->buflen);
|
|
|
+ dev_err(dd->dev, "dma %zd bytes error\n", dd->buflen);
|
|
|
err = -EINVAL;
|
|
|
goto err_map_out;
|
|
|
}
|