tty: hvc: Fix the RISC-V SBI driver for a refactoring
PATCH 1/1 tty: hvc: Fix the RISC-V SBI driver for a refactoring
From: Palmer Dabbelt <[email protected]>
I missed the int->size_t refactoring in f32fcbedbe92 ("tty: hvc: convert to u8 and size_t"), which causes the newly used ops in 88ead68e764c ("tty: Add SBI debug console support to HVC SBI driver") to fail to build due to a
linux/drivers/tty/hvc/hvc_riscv_sbi.c:59:15: error: incompatible function pointer types initializing 'ssize_t (*)(uint32_t, const u8 *, size_t)' (aka 'long (*)(unsigned int, const unsigned char *, unsigned long)') with an expression of type 'int (uint32_t, const char *, int)' (aka 'int (unsigned int, const char *, int)') [-Wincompatible-function-pointer-types]
.put_chars = hvc_sbi_dbcn_tty_put,
---
I now remember Anup pointing this one out, but looks like I forgot about it.
--- drivers/tty/hvc/hvc_riscv_sbi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/tty/hvc/hvc_riscv_sbi.c +2 -2
@@ -15,7 +15,7 @@#include "hvc_console.h" -static int hvc_sbi_tty_put (uint32_t vtermno,const char *buf,int count) +static size_t hvc_sbi_tty_put (uint32_t vtermno,const char *buf,int count) {int i;
@@ -25,7 +25,7 @@ static int hvc_sbi_tty_put(uint32_t vtermno, const char *buf, int count)return i; } -static int hvc_sbi_tty_get (uint32_t vtermno,char *buf,int count) +static size_t hvc_sbi_tty_get (uint32_t vtermno,char *buf,int count) {int i, c;
Signature · 1 line
2.43.0
Quoted 25 lines · Palmer Dabbelt
From: Palmer Dabbelt <[email protected]>
I missed the
int->size_trefactoring inf32fcbedbe92("tty: hvc: convert to u8 andsize_t"), which causes the newly used ops in88ead68e764c("tty: Add SBI debug console support to HVC SBI driver") to fail to build due to a
linux/drivers/tty/hvc/hvc_riscv_sbi.c:59:15: error: incompatible function pointer types initializing 'ssize_t(*)(uint32_t, const u8 *,size_t)' (aka 'long (*)(unsigned int, const unsigned char *, unsigned long)') with an expression of type 'int (uint32_t, const char *, int)' (aka 'int (unsigned int, const char *, int)') [-Wincompatible-function-pointer-types]
.put_chars =hvc_sbi_dbcn_tty_put,Fixes f32fcbedbe92 ("tty: hvc: convert to u8 and size_t")Fixes 88ead68e764c ("tty: Add SBI debug console support to HVC SBI driver")Signed-off-by Palmer Dabbelt <[email protected]>---
I now remember Anup pointing this one out, but looks like I forgot about it.--- drivers/tty/hvc/hvc_riscv_sbi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/tty/hvc/hvc_riscv_sbi.c +0
-0
drivers/tty/hvc/hvc_riscv_sbi.c line 18
Quoted 5 lines
drivers/tty/hvc/hvc_riscv_sbi.c +1
-1@@ -15,7 +15,7 @@#include "hvc_console.h" -static int hvc_sbi_tty_put (uint32_t vtermno,const char *buf,int count) +static size_t hvc_sbi_tty_put (uint32_t vtermno,const char *buf,int count)
I got a little lost in my branches here, that should be "ssize_t". I'll send a v2 when I figure out why my tester is acting oddly...
Quoted 11 lines
drivers/tty/hvc/hvc_riscv_sbi.c +1
-1{int i;@@ -25,7 +25,7 @@ static int hvc_sbi_tty_put(uint32_t vtermno, const char *buf, int count)return i; } -static int hvc_sbi_tty_get (uint32_t vtermno,char *buf,int count) +static size_t hvc_sbi_tty_get (uint32_t vtermno,char *buf,int count) {int i, c;