| Message ID | 20240119215612.20529-2-palmer@rivosinc.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere, archived |
| Headers | show |
| Series | tty: hvc: Fix the RISC-V SBI driver for a refactoring | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/github-powerpc_sparse | success | Successfully ran 4 jobs. |
| snowpatch_ozlabs/github-powerpc_clang | success | Successfully ran 6 jobs. |
| snowpatch_ozlabs/github-powerpc_kernel_qemu | success | Successfully ran 23 jobs. |
On Fri, 19 Jan 2024 13:56:13 PST (-0800), Palmer Dabbelt wrote: > From: Palmer Dabbelt <palmer@rivosinc.com> > > 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, > > 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 <palmer@rivosinc.com> > --- > 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(-) > > diff --git a/drivers/tty/hvc/hvc_riscv_sbi.c b/drivers/tty/hvc/hvc_riscv_sbi.c > index 2f3571f17ecd..c08718be8e73 100644 > --- a/drivers/tty/hvc/hvc_riscv_sbi.c > +++ b/drivers/tty/hvc/hvc_riscv_sbi.c > @@ -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... > { > 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;
diff --git a/drivers/tty/hvc/hvc_riscv_sbi.c b/drivers/tty/hvc/hvc_riscv_sbi.c index 2f3571f17ecd..c08718be8e73 100644 --- a/drivers/tty/hvc/hvc_riscv_sbi.c +++ b/drivers/tty/hvc/hvc_riscv_sbi.c @@ -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;