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

Commit a0a96ee9 authored by Anton Blanchard's avatar Anton Blanchard Committed by Benjamin Herrenschmidt
Browse files

powerpc/pseries: Simplify H_GET_TERM_CHAR 



plpar_get_term_char is only used once and just adds a layer
of complexity to H_GET_TERM_CHAR. plpar_put_term_char isn't
used at all so we can remove it.

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 01b0e07e

arch/powerpc/platforms/pseries/hvconsole.c

+9 −3
Original line number Diff line number Diff line
@@ -40,10 +40,16 @@ 
 */

int hvc_get_chars(uint32_t vtermno, char *buf, int count)

{

	unsigned long got;

	long ret;

	unsigned long retbuf[PLPAR_HCALL_BUFSIZE];

	unsigned long *lbuf = (unsigned long *)buf;



	if (plpar_get_term_char(vtermno, &got, buf) == H_SUCCESS)

		return got;

	ret = plpar_hcall(H_GET_TERM_CHAR, retbuf, vtermno);

	lbuf[0] = retbuf[1];

	lbuf[1] = retbuf[2];



	if (ret == H_SUCCESS)

		return retbuf[0];



	return 0;

}

arch/powerpc/platforms/pseries/plpar_wrappers.h

+0 −24
Original line number Diff line number Diff line
@@ -256,30 +256,6 @@ static inline long plpar_tce_stuff(unsigned long liobn, unsigned long ioba, 
	return plpar_hcall_norets(H_STUFF_TCE, liobn, ioba, tceval, count);

}



static inline long plpar_get_term_char(unsigned long termno,

		unsigned long *len_ret, char *buf_ret)

{

	long rc;

	unsigned long retbuf[PLPAR_HCALL_BUFSIZE];

	unsigned long *lbuf = (unsigned long *)buf_ret;	/* TODO: alignment? */



	rc = plpar_hcall(H_GET_TERM_CHAR, retbuf, termno);



	*len_ret = retbuf[0];

	lbuf[0] = retbuf[1];

	lbuf[1] = retbuf[2];



	return rc;

}



static inline long plpar_put_term_char(unsigned long termno, unsigned long len,

		const char *buffer)

{

	unsigned long *lbuf = (unsigned long *)buffer;	/* TODO: alignment? */

	return plpar_hcall_norets(H_PUT_TERM_CHAR, termno, len, lbuf[0],

			lbuf[1]);

}



/* Set various resource mode parameters */

static inline long plpar_set_mode(unsigned long mflags, unsigned long resource,

		unsigned long value1, unsigned long value2)