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: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --git a/arch/powerpc/platforms/pseries/hvconsole.c b/arch/powerpc/platforms/pseries/hvconsole.c
index b344f94b040091b60eac57a80c5218a2e5071ebc..aa0aa37a4fd077bf29caff8602911f8bff050e4a 100644 (file)
--- a/arch/powerpc/platforms/pseries/hvconsole.c
+++ b/arch/powerpc/platforms/pseries/hvconsole.c
@@ -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;
+
+       ret = plpar_hcall(H_GET_TERM_CHAR, retbuf, vtermno);
+       lbuf[0] = retbuf[1];
+       lbuf[1] = retbuf[2];
 
-       if (plpar_get_term_char(vtermno, &got, buf) == H_SUCCESS)
-               return got;
+       if (ret == H_SUCCESS)
+               return retbuf[0];
 
        return 0;
 }

diff --git a/arch/powerpc/platforms/pseries/plpar_wrappers.h b/arch/powerpc/platforms/pseries/plpar_wrappers.h
index f35787b6a5e051d45275b5e211daffa1fc3c9cde..417d0bfa451052256c333f9b5021c89332244377 100644 (file)
--- a/arch/powerpc/platforms/pseries/plpar_wrappers.h
+++ b/arch/powerpc/platforms/pseries/plpar_wrappers.h
@@ -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)