Skip to content

Commit

Permalink
tty: ipoctal: convert to u8 and size_t
Browse files Browse the repository at this point in the history
Switch character types to u8 and sizes to size_t. To conform to
characters/sizes in the rest of the tty layer.

Signed-off-by: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Cc: Vaibhav Gupta <vaibhavgupta40@gmail.com>
Cc: Jens Taprogge <jens.taprogge@taprogge.org>
Cc: industrypack-devel@lists.sourceforge.net
Link: https://lore.kernel.org/r/20231206073712.17776-14-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Jiri Slaby (SUSE) authored and gregkh committed Dec 8, 2023
1 parent f32fcbe commit 2f98231
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions drivers/ipack/devices/ipoctal.c
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,7 @@ static int ipoctal_get_icount(struct tty_struct *tty,
static void ipoctal_irq_rx(struct ipoctal_channel *channel, u8 sr)
{
struct tty_port *port = &channel->tty_port;
unsigned char value;
unsigned char flag;
u8 isr;
u8 isr, value, flag;

do {
value = ioread8(&channel->regs->r.rhr);
Expand Down Expand Up @@ -202,8 +200,8 @@ static void ipoctal_irq_rx(struct ipoctal_channel *channel, u8 sr)

static void ipoctal_irq_tx(struct ipoctal_channel *channel)
{
unsigned char value;
unsigned int *pointer_write = &channel->pointer_write;
u8 value;

if (channel->nb_bytes == 0)
return;
Expand Down Expand Up @@ -436,11 +434,11 @@ static int ipoctal_inst_slot(struct ipoctal *ipoctal, unsigned int bus_nr,
return res;
}

static inline int ipoctal_copy_write_buffer(struct ipoctal_channel *channel,
const u8 *buf, int count)
static inline size_t ipoctal_copy_write_buffer(struct ipoctal_channel *channel,
const u8 *buf, size_t count)
{
unsigned long flags;
int i;
size_t i;
unsigned int *pointer_read = &channel->pointer_read;

/* Copy the bytes from the user buffer to the internal one */
Expand All @@ -462,7 +460,7 @@ static ssize_t ipoctal_write_tty(struct tty_struct *tty, const u8 *buf,
size_t count)
{
struct ipoctal_channel *channel = tty->driver_data;
unsigned int char_copied;
size_t char_copied;

char_copied = ipoctal_copy_write_buffer(channel, buf, count);

Expand Down

0 comments on commit 2f98231

Please sign in to comment.