Skip to content

Commit

Permalink
tty: use u8 for flags
Browse files Browse the repository at this point in the history
This makes all those 'char's an explicit 'u8'. This is part of the
continuing unification of chars and flags to be consistent u8.

This approaches tty_port_default_receive_buf().

Note that we do not change signedness as we compile with
-funsigned-char.

Signed-off-by: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Cc: William Hubbs <w.d.hubbs@gmail.com>
Cc: Chris Brannon <chris@the-brannons.com>
Cc: Kirk Reiser <kirk@reisers.ca>
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Cc: Marcel Holtmann <marcel@holtmann.org>
Cc: Johan Hedberg <johan.hedberg@gmail.com>
Cc: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Max Staudt <max@enpas.org>
Cc: Wolfgang Grandegger <wg@grandegger.com>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Cc: Andreas Koensgen <ajk@comnets.uni-bremen.de>
Cc: Jeremy Kerr <jk@codeconstruct.com.au>
Cc: Matt Johnston <matt@codeconstruct.com.au>
Cc: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Acked-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20230810091510.13006-18-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Jiri Slaby (SUSE) authored and gregkh committed Aug 11, 2023
1 parent a8d9cd2 commit 892bc20
Show file tree
Hide file tree
Showing 23 changed files with 54 additions and 55 deletions.
2 changes: 1 addition & 1 deletion drivers/accessibility/speakup/spk_ttyio.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ static void spk_ttyio_ldisc_close(struct tty_struct *tty)
}

static size_t spk_ttyio_receive_buf2(struct tty_struct *tty, const u8 *cp,
const char *fp, size_t count)
const u8 *fp, size_t count)
{
struct spk_ldisc_data *ldisc_data = tty->disc_data;
struct spk_synth *synth = ldisc_data->synth;
Expand Down
2 changes: 1 addition & 1 deletion drivers/bluetooth/hci_ldisc.c
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@ static void hci_uart_tty_wakeup(struct tty_struct *tty)
* Return Value: None
*/
static void hci_uart_tty_receive(struct tty_struct *tty, const u8 *data,
const char *flags, size_t count)
const u8 *flags, size_t count)
{
struct hci_uart *hu = tty->disc_data;

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/serio/serport.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ static void serport_ldisc_close(struct tty_struct *tty)
*/

static void serport_ldisc_receive(struct tty_struct *tty, const u8 *cp,
const char *fp, size_t count)
const u8 *fp, size_t count)
{
struct serport *serport = tty->disc_data;
unsigned long flags;
Expand Down
2 changes: 1 addition & 1 deletion drivers/misc/ti-st/st_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,7 @@ static void st_tty_close(struct tty_struct *tty)
}

static void st_tty_receive(struct tty_struct *tty, const u8 *data,
const char *tty_flags, size_t count)
const u8 *tty_flags, size_t count)
{
#ifdef VERBOSE
print_hex_dump(KERN_DEBUG, ">in>", DUMP_PREFIX_NONE,
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/caif/caif_serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ static inline void debugfs_tx(struct ser_device *ser, const u8 *data, int size)
#endif

static void ldisc_receive(struct tty_struct *tty, const u8 *data,
const char *flags, size_t count)
const u8 *flags, size_t count)
{
struct sk_buff *skb = NULL;
struct ser_device *ser;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/can/can327.c
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,7 @@ static bool can327_is_valid_rx_char(u8 c)
* functions may be called in parallel.
*/
static void can327_ldisc_rx(struct tty_struct *tty, const u8 *cp,
const char *fp, size_t count)
const u8 *fp, size_t count)
{
struct can327 *elm = tty->disc_data;
size_t first_new_char_idx;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/can/slcan/slcan-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -775,7 +775,7 @@ static const struct net_device_ops slcan_netdev_ops = {
* in parallel
*/
static void slcan_receive_buf(struct tty_struct *tty, const u8 *cp,
const char *fp, size_t count)
const u8 *fp, size_t count)
{
struct slcan *sl = tty->disc_data;

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/hamradio/6pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ static void sixpack_write_wakeup(struct tty_struct *tty)
* and sent on to some IP layer for further processing.
*/
static void sixpack_receive_buf(struct tty_struct *tty, const u8 *cp,
const char *fp, size_t count)
const u8 *fp, size_t count)
{
struct sixpack *sp;
int count1;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/hamradio/mkiss.c
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,7 @@ static int mkiss_ioctl(struct tty_struct *tty, unsigned int cmd,
* and sent on to the AX.25 layer for further processing.
*/
static void mkiss_receive_buf(struct tty_struct *tty, const u8 *cp,
const char *fp, size_t count)
const u8 *fp, size_t count)
{
struct mkiss *ax = mkiss_get(tty);

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/mctp/mctp-serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ static void mctp_serial_push(struct mctp_serial *dev, unsigned char c)
}

static void mctp_serial_tty_receive_buf(struct tty_struct *tty, const u8 *c,
const char *f, size_t len)
const u8 *f, size_t len)
{
struct mctp_serial *dev = tty->disc_data;
int i;
Expand Down
7 changes: 3 additions & 4 deletions drivers/net/ppp/ppp_async.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ static int ppp_async_send(struct ppp_channel *chan, struct sk_buff *skb);
static int ppp_async_push(struct asyncppp *ap);
static void ppp_async_flush_output(struct asyncppp *ap);
static void ppp_async_input(struct asyncppp *ap, const unsigned char *buf,
const char *flags, int count);
const u8 *flags, int count);
static int ppp_async_ioctl(struct ppp_channel *chan, unsigned int cmd,
unsigned long arg);
static void ppp_async_process(struct tasklet_struct *t);
Expand Down Expand Up @@ -330,7 +330,7 @@ ppp_asynctty_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg)

/* May sleep, don't call from interrupt level or with interrupts disabled */
static void
ppp_asynctty_receive(struct tty_struct *tty, const u8 *buf, const char *cflags,
ppp_asynctty_receive(struct tty_struct *tty, const u8 *buf, const u8 *cflags,
size_t count)
{
struct asyncppp *ap = ap_get(tty);
Expand Down Expand Up @@ -819,8 +819,7 @@ process_input_packet(struct asyncppp *ap)
other ldisc functions but will not be re-entered */

static void
ppp_async_input(struct asyncppp *ap, const u8 *buf, const char *flags,
int count)
ppp_async_input(struct asyncppp *ap, const u8 *buf, const u8 *flags, int count)
{
struct sk_buff *skb;
int c, i, j, n, s, f;
Expand Down
6 changes: 3 additions & 3 deletions drivers/net/ppp/ppp_synctty.c
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ static int ppp_sync_ioctl(struct ppp_channel *chan, unsigned int cmd,
static void ppp_sync_process(struct tasklet_struct *t);
static int ppp_sync_push(struct syncppp *ap);
static void ppp_sync_flush_output(struct syncppp *ap);
static void ppp_sync_input(struct syncppp *ap, const u8 *buf, const char *flags,
static void ppp_sync_input(struct syncppp *ap, const u8 *buf, const u8 *flags,
int count);

static const struct ppp_channel_ops sync_ops = {
Expand Down Expand Up @@ -323,7 +323,7 @@ ppp_synctty_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg)

/* May sleep, don't call from interrupt level or with interrupts disabled */
static void
ppp_sync_receive(struct tty_struct *tty, const u8 *buf, const char *cflags,
ppp_sync_receive(struct tty_struct *tty, const u8 *buf, const u8 *cflags,
size_t count)
{
struct syncppp *ap = sp_get(tty);
Expand Down Expand Up @@ -655,7 +655,7 @@ ppp_sync_flush_output(struct syncppp *ap)
* frame is considered to be in error and is tossed.
*/
static void
ppp_sync_input(struct syncppp *ap, const u8 *buf, const char *flags, int count)
ppp_sync_input(struct syncppp *ap, const u8 *buf, const u8 *flags, int count)
{
struct sk_buff *skb;
unsigned char *p;
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/slip/slip.c
Original file line number Diff line number Diff line change
Expand Up @@ -685,8 +685,8 @@ static void sl_setup(struct net_device *dev)
* in parallel
*/

static void slip_receive_buf(struct tty_struct *tty, const u8 *cp,
const char *fp, size_t count)
static void slip_receive_buf(struct tty_struct *tty, const u8 *cp, const u8 *fp,
size_t count)
{
struct slip *sl = tty->disc_data;

Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/n_gsm.c
Original file line number Diff line number Diff line change
Expand Up @@ -3490,7 +3490,7 @@ static void gsmld_detach_gsm(struct tty_struct *tty, struct gsm_mux *gsm)
}

static void gsmld_receive_buf(struct tty_struct *tty, const u8 *cp,
const char *fp, size_t count)
const u8 *fp, size_t count)
{
struct gsm_mux *gsm = tty->disc_data;
char flags = TTY_NORMAL;
Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/n_hdlc.c
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ static void n_hdlc_tty_wakeup(struct tty_struct *tty)
* interpreted as one HDLC frame.
*/
static void n_hdlc_tty_receive(struct tty_struct *tty, const u8 *data,
const char *flags, size_t count)
const u8 *flags, size_t count)
{
register struct n_hdlc *n_hdlc = tty->disc_data;
register struct n_hdlc_buf *buf;
Expand Down
28 changes: 14 additions & 14 deletions drivers/tty/n_tty.c
Original file line number Diff line number Diff line change
Expand Up @@ -1480,7 +1480,7 @@ n_tty_receive_char_lnext(struct tty_struct *tty, unsigned char c, char flag)

/* Caller must ensure count > 0 */
static void n_tty_lookahead_flow_ctrl(struct tty_struct *tty, const u8 *cp,
const unsigned char *fp, size_t count)
const u8 *fp, size_t count)
{
struct n_tty_data *ldata = tty->disc_data;
unsigned char flag = TTY_NORMAL;
Expand Down Expand Up @@ -1520,11 +1520,11 @@ n_tty_receive_buf_real_raw(const struct tty_struct *tty, const u8 *cp,
}

static void
n_tty_receive_buf_raw(struct tty_struct *tty, const u8 *cp,
const char *fp, int count)
n_tty_receive_buf_raw(struct tty_struct *tty, const u8 *cp, const u8 *fp,
int count)
{
struct n_tty_data *ldata = tty->disc_data;
char flag = TTY_NORMAL;
u8 flag = TTY_NORMAL;

while (count--) {
if (fp)
Expand All @@ -1537,8 +1537,8 @@ n_tty_receive_buf_raw(struct tty_struct *tty, const u8 *cp,
}

static void
n_tty_receive_buf_closing(struct tty_struct *tty, const u8 *cp,
const char *fp, int count, bool lookahead_done)
n_tty_receive_buf_closing(struct tty_struct *tty, const u8 *cp, const u8 *fp,
int count, bool lookahead_done)
{
char flag = TTY_NORMAL;

Expand All @@ -1551,11 +1551,11 @@ n_tty_receive_buf_closing(struct tty_struct *tty, const u8 *cp,
}

static void n_tty_receive_buf_standard(struct tty_struct *tty, const u8 *cp,
const char *fp, int count,
const u8 *fp, int count,
bool lookahead_done)
{
struct n_tty_data *ldata = tty->disc_data;
char flag = TTY_NORMAL;
u8 flag = TTY_NORMAL;

while (count--) {
u8 c = *cp++;
Expand Down Expand Up @@ -1589,8 +1589,8 @@ static void n_tty_receive_buf_standard(struct tty_struct *tty, const u8 *cp,
}
}

static void __receive_buf(struct tty_struct *tty, const u8 *cp,
const char *fp, int count)
static void __receive_buf(struct tty_struct *tty, const u8 *cp, const u8 *fp,
int count)
{
struct n_tty_data *ldata = tty->disc_data;
bool preops = I_ISTRIP(tty) || (I_IUCLC(tty) && L_IEXTEN(tty));
Expand Down Expand Up @@ -1664,8 +1664,8 @@ static void __receive_buf(struct tty_struct *tty, const u8 *cp,
* publishes commit_head or canon_head
*/
static size_t
n_tty_receive_buf_common(struct tty_struct *tty, const u8 *cp,
const char *fp, int count, int flow)
n_tty_receive_buf_common(struct tty_struct *tty, const u8 *cp, const u8 *fp,
int count, int flow)
{
struct n_tty_data *ldata = tty->disc_data;
size_t rcvd = 0;
Expand Down Expand Up @@ -1746,13 +1746,13 @@ n_tty_receive_buf_common(struct tty_struct *tty, const u8 *cp,
}

static void n_tty_receive_buf(struct tty_struct *tty, const u8 *cp,
const char *fp, size_t count)
const u8 *fp, size_t count)
{
n_tty_receive_buf_common(tty, cp, fp, count, 0);
}

static size_t n_tty_receive_buf2(struct tty_struct *tty, const u8 *cp,
const char *fp, size_t count)
const u8 *fp, size_t count)
{
return n_tty_receive_buf_common(tty, cp, fp, count, 1);
}
Expand Down
8 changes: 4 additions & 4 deletions drivers/tty/tty_buffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ EXPORT_SYMBOL_GPL(tty_buffer_request_room);
* Returns: the number added.
*/
int tty_insert_flip_string_fixed_flag(struct tty_port *port, const u8 *chars,
char flag, size_t size)
u8 flag, size_t size)
{
int copied = 0;
bool flags = flag != TTY_NORMAL;
Expand Down Expand Up @@ -356,7 +356,7 @@ EXPORT_SYMBOL(tty_insert_flip_string_fixed_flag);
* Returns: the number added.
*/
int tty_insert_flip_string_flags(struct tty_port *port, const u8 *chars,
const char *flags, size_t size)
const u8 *flags, size_t size)
{
int copied = 0;

Expand Down Expand Up @@ -390,7 +390,7 @@ EXPORT_SYMBOL(tty_insert_flip_string_flags);
* Queue a single byte @ch to the tty buffering, with an optional flag. This is
* the slow path of tty_insert_flip_char().
*/
int __tty_insert_flip_char(struct tty_port *port, u8 ch, char flag)
int __tty_insert_flip_char(struct tty_port *port, u8 ch, u8 flag)
{
struct tty_buffer *tb;
bool flags = flag != TTY_NORMAL;
Expand Down Expand Up @@ -449,7 +449,7 @@ EXPORT_SYMBOL_GPL(tty_prepare_flip_string);
*
* Returns: the number of bytes processed.
*/
size_t tty_ldisc_receive_buf(struct tty_ldisc *ld, const u8 *p, const char *f,
size_t tty_ldisc_receive_buf(struct tty_ldisc *ld, const u8 *p, const u8 *f,
size_t count)
{
if (ld->ops->receive_buf2)
Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/tty_port.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ static size_t tty_port_default_receive_buf(struct tty_port *port, const u8 *p,
if (!ld)
return 0;

count = tty_ldisc_receive_buf(ld, p, (char *)f, count);
count = tty_ldisc_receive_buf(ld, p, f, count);

tty_ldisc_deref(ld);

Expand Down
4 changes: 2 additions & 2 deletions include/linux/tty_buffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ static inline u8 *char_buf_ptr(struct tty_buffer *b, int ofs)
return ((u8 *)b->data) + ofs;
}

static inline char *flag_buf_ptr(struct tty_buffer *b, int ofs)
static inline u8 *flag_buf_ptr(struct tty_buffer *b, int ofs)
{
return (char *)char_buf_ptr(b, ofs) + b->size;
return char_buf_ptr(b, ofs) + b->size;
}

struct tty_bufhead {
Expand Down
10 changes: 5 additions & 5 deletions include/linux/tty_flip.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ int tty_buffer_set_limit(struct tty_port *port, int limit);
unsigned int tty_buffer_space_avail(struct tty_port *port);
int tty_buffer_request_room(struct tty_port *port, size_t size);
int tty_insert_flip_string_flags(struct tty_port *port, const u8 *chars,
const char *flags, size_t size);
const u8 *flags, size_t size);
int tty_insert_flip_string_fixed_flag(struct tty_port *port, const u8 *chars,
char flag, size_t size);
u8 flag, size_t size);
int tty_prepare_flip_string(struct tty_port *port, u8 **chars, size_t size);
void tty_flip_buffer_push(struct tty_port *port);
int __tty_insert_flip_char(struct tty_port *port, u8 ch, char flag);
int __tty_insert_flip_char(struct tty_port *port, u8 ch, u8 flag);

static inline int tty_insert_flip_char(struct tty_port *port, u8 ch, char flag)
static inline int tty_insert_flip_char(struct tty_port *port, u8 ch, u8 flag)
{
struct tty_buffer *tb = port->buf.tail;
int change;
Expand All @@ -39,7 +39,7 @@ static inline int tty_insert_flip_string(struct tty_port *port,
return tty_insert_flip_string_fixed_flag(port, chars, TTY_NORMAL, size);
}

size_t tty_ldisc_receive_buf(struct tty_ldisc *ld, const u8 *p, const char *f,
size_t tty_ldisc_receive_buf(struct tty_ldisc *ld, const u8 *p, const u8 *f,
size_t count);

void tty_buffer_lock_exclusive(struct tty_port *port);
Expand Down
12 changes: 6 additions & 6 deletions include/linux/tty_ldisc.h
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ int ldsem_down_write_nested(struct ld_semaphore *sem, int subclass,
* Optional. Can sleep.
*
* @receive_buf: [DRV] ``void ()(struct tty_struct *tty, const u8 *cp,
* const char *fp, size_t count)``
* const u8 *fp, size_t count)``
*
* This function is called by the low-level tty driver to send characters
* received by the hardware to the line discpline for processing. @cp is
Expand Down Expand Up @@ -192,7 +192,7 @@ int ldsem_down_write_nested(struct ld_semaphore *sem, int subclass,
* Optional.
*
* @receive_buf2: [DRV] ``ssize_t ()(struct tty_struct *tty, const u8 *cp,
* const char *fp, size_t count)``
* const u8 *fp, size_t count)``
*
* This function is called by the low-level tty driver to send characters
* received by the hardware to the line discpline for processing. @cp is a
Expand All @@ -205,7 +205,7 @@ int ldsem_down_write_nested(struct ld_semaphore *sem, int subclass,
* Optional.
*
* @lookahead_buf: [DRV] ``void ()(struct tty_struct *tty, const u8 *cp,
* const char *fp, size_t count)``
* const u8 *fp, size_t count)``
*
* This function is called by the low-level tty driver for characters
* not eaten by ->receive_buf() or ->receive_buf2(). It is useful for
Expand Down Expand Up @@ -256,13 +256,13 @@ struct tty_ldisc_ops {
* The following routines are called from below.
*/
void (*receive_buf)(struct tty_struct *tty, const u8 *cp,
const char *fp, size_t count);
const u8 *fp, size_t count);
void (*write_wakeup)(struct tty_struct *tty);
void (*dcd_change)(struct tty_struct *tty, bool active);
size_t (*receive_buf2)(struct tty_struct *tty, const u8 *cp,
const char *fp, size_t count);
const u8 *fp, size_t count);
void (*lookahead_buf)(struct tty_struct *tty, const u8 *cp,
const unsigned char *fp, size_t count);
const u8 *fp, size_t count);

struct module *owner;
};
Expand Down
2 changes: 1 addition & 1 deletion net/nfc/nci/uart.c
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ static int nci_uart_default_recv_buf(struct nci_uart *nu, const u8 *data,
* Return Value: None
*/
static void nci_uart_tty_receive(struct tty_struct *tty, const u8 *data,
const char *flags, size_t count)
const u8 *flags, size_t count)
{
struct nci_uart *nu = tty->disc_data;

Expand Down
Loading

0 comments on commit 892bc20

Please sign in to comment.