Commit cb8566b9 authored by Jiri Slaby (SUSE)'s avatar Jiri Slaby (SUSE) Committed by Greg Kroah-Hartman
Browse files

tty: moxa: convert to u8 and size_t 



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: default avatar"Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20231206073712.17776-18-jirislaby@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2573f7ea

drivers/tty/moxa.c

+8 −7
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ static void MoxaPortLineCtrl(struct moxa_port *, bool, bool); 
static void MoxaPortFlowCtrl(struct moxa_port *, int, int, int, int, int);

static int MoxaPortLineStatus(struct moxa_port *);

static void MoxaPortFlushData(struct moxa_port *, int);

static int MoxaPortWriteData(struct tty_struct *, const unsigned char *, int);

static ssize_t MoxaPortWriteData(struct tty_struct *, const u8 *, size_t);

static int MoxaPortReadData(struct moxa_port *);

static unsigned int MoxaPortTxQueue(struct moxa_port *);

static int MoxaPortRxQueue(struct moxa_port *);
@@ -1933,10 +1933,10 @@ static void MoxaPortFlushData(struct moxa_port *port, int mode) 
 *

 *      Function 20:    Write data.

 *      Syntax:

 *      int  MoxaPortWriteData(int port, unsigned char * buffer, int length);

 *      ssize_t  MoxaPortWriteData(int port, u8 *buffer, size_t length);

 *           int port           : port number (0 - 127)

 *           unsigned char * buffer     : pointer to write data buffer.

 *           int length         : write data length

 *           u8 *buffer         : pointer to write data buffer.

 *           size_t length      : write data length

 *

 *           return:    0 - length      : real write data length

 *
@@ -2163,11 +2163,12 @@ static int MoxaPortLineStatus(struct moxa_port *port) 
	return val;

}



static int MoxaPortWriteData(struct tty_struct *tty, const u8 *buffer, int len)

static ssize_t MoxaPortWriteData(struct tty_struct *tty, const u8 *buffer,

				 size_t len)

{

	struct moxa_port *port = tty->driver_data;

	void __iomem *baseAddr, *ofsAddr, *ofs;

	unsigned int c, total;

	size_t c, total;

	u16 head, tail, tx_mask, spage, epage;

	u16 pageno, pageofs, bufhead;
@@ -2224,8 +2225,8 @@ static int MoxaPortWriteData(struct tty_struct *tty, const u8 *buffer, int len) 
static int MoxaPortReadData(struct moxa_port *port)

{

	struct tty_struct *tty = port->port.tty;

	unsigned char *dst;

	void __iomem *baseAddr, *ofsAddr, *ofs;

	u8 *dst;

	unsigned int count, len, total;

	u16 tail, rx_mask, spage, epage;

	u16 pageno, pageofs, bufhead, head;