Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d2a1b2d authored by Andy Shevchenko's avatar Andy Shevchenko Committed by James Morris
Browse files

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
parent 26d43845

lib/mpi/mpi-internal.h

+0 −4
Original line number Diff line number Diff line
@@ -65,10 +65,6 @@ 
typedef mpi_limb_t *mpi_ptr_t;	/* pointer to a limb */

typedef int mpi_size_t;		/* (must be a signed type) */



#define ABS(x) (x >= 0 ? x : -x)

#define MIN(l, o) ((l) < (o) ? (l) : (o))

#define MAX(h, i) ((h) > (i) ? (h) : (i))



static inline int RESIZE_IF_NEEDED(MPI a, unsigned b)

{

	if (a->alloced < b)

lib/mpi/mpicoder.c

+4 −4
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ MPI mpi_read_raw_data(const void *xbuffer, size_t nbytes) 
	else

		nbits = 0;



	nlimbs = (nbytes + BYTES_PER_MPI_LIMB - 1) / BYTES_PER_MPI_LIMB;

	nlimbs = DIV_ROUND_UP(nbytes, BYTES_PER_MPI_LIMB);

	val = mpi_alloc(nlimbs);

	if (!val)

		return NULL;
@@ -96,8 +96,8 @@ MPI mpi_read_from_buffer(const void *xbuffer, unsigned *ret_nread) 
	buffer += 2;

	nread = 2;



	nbytes = (nbits + 7) / 8;

	nlimbs = (nbytes + BYTES_PER_MPI_LIMB - 1) / BYTES_PER_MPI_LIMB;

	nbytes = DIV_ROUND_UP(nbits, 8);

	nlimbs = DIV_ROUND_UP(nbytes, BYTES_PER_MPI_LIMB);

	val = mpi_alloc(nlimbs);

	if (!val)

		return NULL;
@@ -193,7 +193,7 @@ int mpi_set_buffer(MPI a, const void *xbuffer, unsigned nbytes, int sign) 
	int nlimbs;

	int i;



	nlimbs = (nbytes + BYTES_PER_MPI_LIMB - 1) / BYTES_PER_MPI_LIMB;

	nlimbs = DIV_ROUND_UP(nbytes, BYTES_PER_MPI_LIMB);

	if (RESIZE_IF_NEEDED(a, nlimbs) < 0)

		return -ENOMEM;

	a->sign = sign;