Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mpilib: use DIV_ROUND_UP and remove unused macros

Remove MIN, MAX and ABS macros that are duplicates kernel's native
implementation.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>

authored by

Andy Shevchenko and committed by
James Morris
0d2a1b2d 26d43845

+4 -8
-4
lib/mpi/mpi-internal.h
··· 65 65 typedef mpi_limb_t *mpi_ptr_t; /* pointer to a limb */ 66 66 typedef int mpi_size_t; /* (must be a signed type) */ 67 67 68 - #define ABS(x) (x >= 0 ? x : -x) 69 - #define MIN(l, o) ((l) < (o) ? (l) : (o)) 70 - #define MAX(h, i) ((h) > (i) ? (h) : (i)) 71 - 72 68 static inline int RESIZE_IF_NEEDED(MPI a, unsigned b) 73 69 { 74 70 if (a->alloced < b)
+4 -4
lib/mpi/mpicoder.c
··· 52 52 else 53 53 nbits = 0; 54 54 55 - nlimbs = (nbytes + BYTES_PER_MPI_LIMB - 1) / BYTES_PER_MPI_LIMB; 55 + nlimbs = DIV_ROUND_UP(nbytes, BYTES_PER_MPI_LIMB); 56 56 val = mpi_alloc(nlimbs); 57 57 if (!val) 58 58 return NULL; ··· 96 96 buffer += 2; 97 97 nread = 2; 98 98 99 - nbytes = (nbits + 7) / 8; 100 - nlimbs = (nbytes + BYTES_PER_MPI_LIMB - 1) / BYTES_PER_MPI_LIMB; 99 + nbytes = DIV_ROUND_UP(nbits, 8); 100 + nlimbs = DIV_ROUND_UP(nbytes, BYTES_PER_MPI_LIMB); 101 101 val = mpi_alloc(nlimbs); 102 102 if (!val) 103 103 return NULL; ··· 193 193 int nlimbs; 194 194 int i; 195 195 196 - nlimbs = (nbytes + BYTES_PER_MPI_LIMB - 1) / BYTES_PER_MPI_LIMB; 196 + nlimbs = DIV_ROUND_UP(nbytes, BYTES_PER_MPI_LIMB); 197 197 if (RESIZE_IF_NEEDED(a, nlimbs) < 0) 198 198 return -ENOMEM; 199 199 a->sign = sign;