tty: use u8 for chars

This makes all those 'unsigned 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(). Flags to be next.

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: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Max Staudt <max@enpas.org>
Cc: Wolfgang Grandegger <wg@grandegger.com>
Cc: Marc Kleine-Budde <mkl@pengutronix.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: 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: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Cc: Peter Ujfalusi <peter.ujfalusi@gmail.com>
Acked-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20230810091510.13006-17-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/accessibility/speakup/spk_ttyio.c b/drivers/accessibility/speakup/spk_ttyio.c
index 736f622068ce6a24db36eaed8c37629fda3ffddc..dd683a079c0850440d1581ff8d9d8bf49e3e7830 100644 (file)
--- a/drivers/accessibility/speakup/spk_ttyio.c
+++ b/drivers/accessibility/speakup/spk_ttyio.c
@@ -71,9 +71,8 @@ static void spk_ttyio_ldisc_close(struct tty_struct *tty)
        kfree(tty->disc_data);
 }
 
-static size_t spk_ttyio_receive_buf2(struct tty_struct *tty,
-                                    const unsigned char *cp, const char *fp,
-                                    size_t count)
+static size_t spk_ttyio_receive_buf2(struct tty_struct *tty, const u8 *cp,
+                                    const char *fp, size_t count)
 {
        struct spk_ldisc_data *ldisc_data = tty->disc_data;
        struct spk_synth *synth = ldisc_data->synth;

diff --git a/drivers/input/serio/serport.c b/drivers/input/serio/serport.c
index 7fc6155131f8dfdbd73baedbb6a5225fa0615564..8bf79d39964d9402a57024f8d040b129b4c82feb 100644 (file)
--- a/drivers/input/serio/serport.c
+++ b/drivers/input/serio/serport.c
@@ -114,9 +114,8 @@ static void serport_ldisc_close(struct tty_struct *tty)
  * 'interrupt' routine.
  */
 
-static void serport_ldisc_receive(struct tty_struct *tty,
-                                 const unsigned char *cp, const char *fp,
-                                 size_t count)
+static void serport_ldisc_receive(struct tty_struct *tty, const u8 *cp,
+                                 const char *fp, size_t count)
 {
        struct serport *serport = tty->disc_data;
        unsigned long flags;

diff --git a/drivers/misc/ti-st/st_core.c b/drivers/misc/ti-st/st_core.c
index c89024ab3d7789af980a7bbda45d6f56c2b4b239..0ce4e46ff1619a05f26c15c2352f955ab64c60dc 100644 (file)
--- a/drivers/misc/ti-st/st_core.c
+++ b/drivers/misc/ti-st/st_core.c
@@ -791,7 +791,7 @@ static void st_tty_close(struct tty_struct *tty)
        pr_debug("%s: done ", __func__);
 }
 
-static void st_tty_receive(struct tty_struct *tty, const unsigned char *data,
+static void st_tty_receive(struct tty_struct *tty, const u8 *data,
                           const char *tty_flags, size_t count)
 {
 #ifdef VERBOSE

diff --git a/drivers/net/can/can327.c b/drivers/net/can/can327.c
index 4bf970df7e8417a1ef1bed6ef2b451ef87210197..a054f5fd0d435c10f10113ea236b201d79c45afb 100644 (file)
--- a/drivers/net/can/can327.c
+++ b/drivers/net/can/can327.c
@@ -885,7 +885,7 @@ static bool can327_is_valid_rx_char(u8 c)
  * This will not be re-entered while running, but other ldisc
  * functions may be called in parallel.
  */
-static void can327_ldisc_rx(struct tty_struct *tty, const unsigned char *cp,
+static void can327_ldisc_rx(struct tty_struct *tty, const u8 *cp,
                            const char *fp, size_t count)
 {
        struct can327 *elm = tty->disc_data;

diff --git a/drivers/net/can/slcan/slcan-core.c b/drivers/net/can/slcan/slcan-core.c
index 63371563d8e2898e02166f0d86e9a162c47ab016..fe5671dbeb77c45cff67718f01f58e76d4b7a2d6 100644 (file)
--- a/drivers/net/can/slcan/slcan-core.c
+++ b/drivers/net/can/slcan/slcan-core.c
@@ -774,9 +774,8 @@ static const struct net_device_ops slcan_netdev_ops = {
  * be re-entered while running but other ldisc functions may be called
  * in parallel
  */
-static void slcan_receive_buf(struct tty_struct *tty,
-                             const unsigned char *cp, const char *fp,
-                             size_t count)
+static void slcan_receive_buf(struct tty_struct *tty, const u8 *cp,
+                             const char *fp, size_t count)
 {
        struct slcan *sl = tty->disc_data;
 

diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index 2089efb0d360cc9f845e63ff3c9a7e428055cf03..9a1f2a3f3b4fa4e3e6425eaf871fbab9794d823b 100644 (file)
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -427,8 +427,8 @@ out:
  * a block of 6pack data has been received, which can now be decapsulated
  * and sent on to some IP layer for further processing.
  */
-static void sixpack_receive_buf(struct tty_struct *tty,
-       const unsigned char *cp, const char *fp, size_t count)
+static void sixpack_receive_buf(struct tty_struct *tty, const u8 *cp,
+                               const char *fp, size_t count)
 {
        struct sixpack *sp;
        int count1;

diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index 1efab6037c7ec2e1dd887f45b823c34aa270e971..26dbcf49bfa67907353becaa7be062bef4245cf5 100644 (file)
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -874,7 +874,7 @@ static int mkiss_ioctl(struct tty_struct *tty, unsigned int cmd,
  * a block of data has been received, which can now be decapsulated
  * and sent on to the AX.25 layer for further processing.
  */
-static void mkiss_receive_buf(struct tty_struct *tty, const unsigned char *cp,
+static void mkiss_receive_buf(struct tty_struct *tty, const u8 *cp,
                              const char *fp, size_t count)
 {
        struct mkiss *ax = mkiss_get(tty);

diff --git a/drivers/net/mctp/mctp-serial.c b/drivers/net/mctp/mctp-serial.c
index 6761f4ff2e7c6db4415f15622abfd75e8a4adf04..5f809a18d30869711b6ca264e7bf83dfece09a33 100644 (file)
--- a/drivers/net/mctp/mctp-serial.c
+++ b/drivers/net/mctp/mctp-serial.c
@@ -390,8 +390,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 unsigned char *c,
+static void mctp_serial_tty_receive_buf(struct tty_struct *tty, const u8 *c,
                                        const char *f, size_t len)
 {
        struct mctp_serial *dev = tty->disc_data;

diff --git a/drivers/net/ppp/ppp_async.c b/drivers/net/ppp/ppp_async.c
index 79b8fca47edb4218db14788b106d1373abee7328..a661ccdea6ab2128f9023d5f7c68a9b545c25a41 100644 (file)
--- a/drivers/net/ppp/ppp_async.c
+++ b/drivers/net/ppp/ppp_async.c
@@ -330,8 +330,8 @@ 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 unsigned char *buf,
-                    const char *cflags, size_t count)
+ppp_asynctty_receive(struct tty_struct *tty, const u8 *buf, const char *cflags,
+                    size_t count)
 {
        struct asyncppp *ap = ap_get(tty);
        unsigned long flags;
@@ -819,8 +819,8 @@ process_input_packet(struct asyncppp *ap)
    other ldisc functions but will not be re-entered */
 
 static void
-ppp_async_input(struct asyncppp *ap, const unsigned char *buf,
-               const char *flags, int count)
+ppp_async_input(struct asyncppp *ap, const u8 *buf, const char *flags,
+               int count)
 {
        struct sk_buff *skb;
        int c, i, j, n, s, f;

diff --git a/drivers/net/ppp/ppp_synctty.c b/drivers/net/ppp/ppp_synctty.c
index 767aca32b315f82a84441735a2999ae648e7f0b8..2a5cf6be9591eb1bcef794ae7bfef2f3f9b2fc41 100644 (file)
--- a/drivers/net/ppp/ppp_synctty.c
+++ b/drivers/net/ppp/ppp_synctty.c
@@ -93,8 +93,8 @@ 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 unsigned char *buf,
-                          const char *flags, int count);
+static void ppp_sync_input(struct syncppp *ap, const u8 *buf, const char *flags,
+                          int count);
 
 static const struct ppp_channel_ops sync_ops = {
        .start_xmit = ppp_sync_send,
@@ -323,8 +323,8 @@ 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 unsigned char *buf,
-                const char *cflags, size_t count)
+ppp_sync_receive(struct tty_struct *tty, const u8 *buf, const char *cflags,
+                size_t count)
 {
        struct syncppp *ap = sp_get(tty);
        unsigned long flags;
@@ -655,8 +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 unsigned char *buf,
-               const char *flags, int count)
+ppp_sync_input(struct syncppp *ap, const u8 *buf, const char *flags, int count)
 {
        struct sk_buff *skb;
        unsigned char *p;

diff --git a/drivers/net/slip/slip.c b/drivers/net/slip/slip.c
index 39450bf748a5905cfed74cdcee327ba7be3c997e..7bfa90724e7bb905e2f6580f42efc4ea56692faa 100644 (file)
--- a/drivers/net/slip/slip.c
+++ b/drivers/net/slip/slip.c
@@ -685,7 +685,7 @@ static void sl_setup(struct net_device *dev)
  * in parallel
  */
 
-static void slip_receive_buf(struct tty_struct *tty, const unsigned char *cp,
+static void slip_receive_buf(struct tty_struct *tty, const u8 *cp,
                             const char *fp, size_t count)
 {
        struct slip *sl = tty->disc_data;

diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index 2f85877b8ba1bdd0f5a363779b38e331de3cbfe8..86d89bbbaa16325bdd888166d0cb06002cf1a22e 100644 (file)
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -3489,7 +3489,7 @@ static void gsmld_detach_gsm(struct tty_struct *tty, struct gsm_mux *gsm)
        gsm->tty = NULL;
 }
 
-static void gsmld_receive_buf(struct tty_struct *tty, const unsigned char *cp,
+static void gsmld_receive_buf(struct tty_struct *tty, const u8 *cp,
                              const char *fp, size_t count)
 {
        struct gsm_mux *gsm = tty->disc_data;

diff --git a/drivers/tty/n_hdlc.c b/drivers/tty/n_hdlc.c
index ce3c779f5c03c05082e0355d42c396b86e5efba6..c86be060baed679a8dd2ab0ffe085d93a93b1de0 100644 (file)
--- a/drivers/tty/n_hdlc.c
+++ b/drivers/tty/n_hdlc.c
@@ -369,7 +369,7 @@ static void n_hdlc_tty_wakeup(struct tty_struct *tty)
  * Called by tty low level driver when receive data is available. Data is
  * interpreted as one HDLC frame.
  */
-static void n_hdlc_tty_receive(struct tty_struct *tty, const __u8 *data,
+static void n_hdlc_tty_receive(struct tty_struct *tty, const u8 *data,
                               const char *flags, size_t count)
 {
        register struct n_hdlc *n_hdlc = tty->disc_data;

diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index ee9b20dcbce667f074099a71bd21f0294ad8c11b..d770007e5215edabaefc41e37953a308cf19e5b6 100644 (file)
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -1479,7 +1479,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 unsigned char *cp,
+static void n_tty_lookahead_flow_ctrl(struct tty_struct *tty, const u8 *cp,
                                      const unsigned char *fp, size_t count)
 {
        struct n_tty_data *ldata = tty->disc_data;
@@ -1500,8 +1500,8 @@ static void n_tty_lookahead_flow_ctrl(struct tty_struct *tty, const unsigned cha
 }
 
 static void
-n_tty_receive_buf_real_raw(const struct tty_struct *tty,
-                          const unsigned char *cp, int count)
+n_tty_receive_buf_real_raw(const struct tty_struct *tty, const u8 *cp,
+                          int count)
 {
        struct n_tty_data *ldata = tty->disc_data;
        size_t n, head;
@@ -1520,7 +1520,7 @@ n_tty_receive_buf_real_raw(const struct tty_struct *tty,
 }
 
 static void
-n_tty_receive_buf_raw(struct tty_struct *tty, const unsigned char *cp,
+n_tty_receive_buf_raw(struct tty_struct *tty, const u8 *cp,
                      const char *fp, int count)
 {
        struct n_tty_data *ldata = tty->disc_data;
@@ -1537,7 +1537,7 @@ n_tty_receive_buf_raw(struct tty_struct *tty, const unsigned char *cp,
 }
 
 static void
-n_tty_receive_buf_closing(struct tty_struct *tty, const unsigned char *cp,
+n_tty_receive_buf_closing(struct tty_struct *tty, const u8 *cp,
                          const char *fp, int count, bool lookahead_done)
 {
        char flag = TTY_NORMAL;
@@ -1550,14 +1550,15 @@ n_tty_receive_buf_closing(struct tty_struct *tty, const unsigned char *cp,
        }
 }
 
-static void n_tty_receive_buf_standard(struct tty_struct *tty,
-               const unsigned char *cp, const char *fp, int count, bool lookahead_done)
+static void n_tty_receive_buf_standard(struct tty_struct *tty, const u8 *cp,
+                                      const char *fp, int count,
+                                      bool lookahead_done)
 {
        struct n_tty_data *ldata = tty->disc_data;
        char flag = TTY_NORMAL;
 
        while (count--) {
-               unsigned char c = *cp++;
+               u8 c = *cp++;
 
                if (fp)
                        flag = *fp++;
@@ -1588,7 +1589,7 @@ static void n_tty_receive_buf_standard(struct tty_struct *tty,
        }
 }
 
-static void __receive_buf(struct tty_struct *tty, const unsigned char *cp,
+static void __receive_buf(struct tty_struct *tty, const u8 *cp,
                          const char *fp, int count)
 {
        struct n_tty_data *ldata = tty->disc_data;
@@ -1663,7 +1664,7 @@ static void __receive_buf(struct tty_struct *tty, const unsigned char *cp,
  *     publishes commit_head or canon_head
  */
 static size_t
-n_tty_receive_buf_common(struct tty_struct *tty, const unsigned char *cp,
+n_tty_receive_buf_common(struct tty_struct *tty, const u8 *cp,
                         const char *fp, int count, int flow)
 {
        struct n_tty_data *ldata = tty->disc_data;
@@ -1744,15 +1745,14 @@ n_tty_receive_buf_common(struct tty_struct *tty, const unsigned char *cp,
        return rcvd;
 }
 
-static void n_tty_receive_buf(struct tty_struct *tty, const unsigned char *cp,
+static void n_tty_receive_buf(struct tty_struct *tty, const u8 *cp,
                              const char *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 unsigned char *cp, const char *fp,
-                                size_t count)
+static size_t n_tty_receive_buf2(struct tty_struct *tty, const u8 *cp,
+                                const char *fp, size_t count)
 {
        return n_tty_receive_buf_common(tty, cp, fp, count, 1);
 }

diff --git a/drivers/tty/tty.h b/drivers/tty/tty.h
index 2751ac3946e71703d86584e67634c8cd652748f0..e31cd9f281de5510be26ff8dc4ea389115b492a3 100644 (file)
--- a/drivers/tty/tty.h
+++ b/drivers/tty/tty.h
@@ -115,6 +115,6 @@ static inline void tty_audit_tiocsti(const struct tty_struct *tty, char ch)
 ssize_t redirected_tty_write(struct kiocb *, struct iov_iter *);
 
 int tty_insert_flip_string_and_push_buffer(struct tty_port *port,
-               const unsigned char *chars, size_t cnt);
+                                          const u8 *chars, size_t cnt);
 
 #endif

diff --git a/drivers/tty/tty_buffer.c b/drivers/tty/tty_buffer.c
index 56f5732ce47f7234682ab13bf75a4f5abb79b7ce..9db42e6ed45bedba28e06c806d1cab87025eb15a 100644 (file)
--- a/drivers/tty/tty_buffer.c
+++ b/drivers/tty/tty_buffer.c
@@ -316,8 +316,8 @@ EXPORT_SYMBOL_GPL(tty_buffer_request_room);
  *
  * Returns: the number added.
  */
-int tty_insert_flip_string_fixed_flag(struct tty_port *port,
-               const unsigned char *chars, char flag, size_t size)
+int tty_insert_flip_string_fixed_flag(struct tty_port *port, const u8 *chars,
+               char flag, size_t size)
 {
        int copied = 0;
        bool flags = flag != TTY_NORMAL;
@@ -355,8 +355,8 @@ EXPORT_SYMBOL(tty_insert_flip_string_fixed_flag);
  *
  * Returns: the number added.
  */
-int tty_insert_flip_string_flags(struct tty_port *port,
-               const unsigned char *chars, const char *flags, size_t size)
+int tty_insert_flip_string_flags(struct tty_port *port, const u8 *chars,
+               const char *flags, size_t size)
 {
        int copied = 0;
 
@@ -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, unsigned char ch, char flag)
+int __tty_insert_flip_char(struct tty_port *port, u8 ch, char flag)
 {
        struct tty_buffer *tb;
        bool flags = flag != TTY_NORMAL;
@@ -421,8 +421,7 @@ EXPORT_SYMBOL(__tty_insert_flip_char);
  * Returns: the length available and buffer pointer (@chars) to the space which
  * is now allocated and accounted for as ready for normal characters.
  */
-int tty_prepare_flip_string(struct tty_port *port, unsigned char **chars,
-               size_t size)
+int tty_prepare_flip_string(struct tty_port *port, u8 **chars, size_t size)
 {
        int space = __tty_buffer_request_room(port, size, false);
 
@@ -450,8 +449,8 @@ EXPORT_SYMBOL_GPL(tty_prepare_flip_string);
  *
  * Returns: the number of bytes processed.
  */
-size_t tty_ldisc_receive_buf(struct tty_ldisc *ld, const unsigned char *p,
-                            const char *f, size_t count)
+size_t tty_ldisc_receive_buf(struct tty_ldisc *ld, const u8 *p, const char *f,
+                            size_t count)
 {
        if (ld->ops->receive_buf2)
                count = ld->ops->receive_buf2(ld->tty, p, f, count);
@@ -489,7 +488,7 @@ static void lookahead_bufs(struct tty_port *port, struct tty_buffer *head)
                }
 
                if (port->client_ops->lookahead_buf) {
-                       unsigned char *p, *f = NULL;
+                       u8 *p, *f = NULL;
 
                        p = char_buf_ptr(head, head->lookahead);
                        if (head->flags)
@@ -620,7 +619,7 @@ EXPORT_SYMBOL(tty_flip_buffer_push);
  * Returns: the number added.
  */
 int tty_insert_flip_string_and_push_buffer(struct tty_port *port,
-               const unsigned char *chars, size_t size)
+                                          const u8 *chars, size_t size)
 {
        struct tty_bufhead *buf = &port->buf;
        unsigned long flags;

diff --git a/include/linux/tty_buffer.h b/include/linux/tty_buffer.h
index 6ceb2789e6c816bc98601f9b106e2e14df005fb2..6f2966b15093beeec7ff3d8866bbd9dc8647e1cc 100644 (file)
--- a/include/linux/tty_buffer.h
+++ b/include/linux/tty_buffer.h
@@ -22,9 +22,9 @@ struct tty_buffer {
        unsigned long data[];
 };
 
-static inline unsigned char *char_buf_ptr(struct tty_buffer *b, int ofs)
+static inline u8 *char_buf_ptr(struct tty_buffer *b, int ofs)
 {
-       return ((unsigned char *)b->data) + ofs;
+       return ((u8 *)b->data) + ofs;
 }
 
 static inline char *flag_buf_ptr(struct tty_buffer *b, int ofs)

diff --git a/include/linux/tty_flip.h b/include/linux/tty_flip.h
index 09c4dbcd00251a39b255338a0156c2379734cb5e..a0fcffeaaa25b5ccce6d901ba0802eb86666b282 100644 (file)
--- a/include/linux/tty_flip.h
+++ b/include/linux/tty_flip.h
@@ -10,17 +10,15 @@ struct tty_ldisc;
 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 unsigned char *chars, const char *flags, size_t size);
-int tty_insert_flip_string_fixed_flag(struct tty_port *port,
-               const unsigned char *chars, char flag, size_t size);
-int tty_prepare_flip_string(struct tty_port *port, unsigned char **chars,
-               size_t size);
+int tty_insert_flip_string_flags(struct tty_port *port, const u8 *chars,
+                                const char *flags, size_t size);
+int tty_insert_flip_string_fixed_flag(struct tty_port *port, const u8 *chars,
+                                     char 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, unsigned char ch, char flag);
+int __tty_insert_flip_char(struct tty_port *port, u8 ch, char flag);
 
-static inline int tty_insert_flip_char(struct tty_port *port,
-                                       unsigned char ch, char flag)
+static inline int tty_insert_flip_char(struct tty_port *port, u8 ch, char flag)
 {
        struct tty_buffer *tb = port->buf.tail;
        int change;
@@ -36,13 +34,13 @@ static inline int tty_insert_flip_char(struct tty_port *port,
 }
 
 static inline int tty_insert_flip_string(struct tty_port *port,
-               const unsigned char *chars, size_t size)
+               const u8 *chars, size_t size)
 {
        return tty_insert_flip_string_fixed_flag(port, chars, TTY_NORMAL, size);
 }
 
-size_t tty_ldisc_receive_buf(struct tty_ldisc *ld, const unsigned char *p,
-                            const char *f, size_t count);
+size_t tty_ldisc_receive_buf(struct tty_ldisc *ld, const u8 *p, const char *f,
+                            size_t count);
 
 void tty_buffer_lock_exclusive(struct tty_port *port);
 void tty_buffer_unlock_exclusive(struct tty_port *port);

diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
index f88529e6a783c4a818855514524c24dd1a7a9527..5551c4400e5989377cd7be2a2499dce70c68186c 100644 (file)
--- a/include/linux/tty_ldisc.h
+++ b/include/linux/tty_ldisc.h
@@ -161,8 +161,8 @@ int ldsem_down_write_nested(struct ld_semaphore *sem, int subclass,
  *
  *     Optional. Can sleep.
  *
- * @receive_buf: [DRV] ``void ()(struct tty_struct *tty,
- *                    const unsigned char *cp, const char *fp, size_t count)``
+ * @receive_buf: [DRV] ``void ()(struct tty_struct *tty, const u8 *cp,
+ *                    const char *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
@@ -191,8 +191,8 @@ int ldsem_down_write_nested(struct ld_semaphore *sem, int subclass,
  *
  *     Optional.
  *
- * @receive_buf2: [DRV] ``ssize_t ()(struct tty_struct *tty,
- *                     const unsigned char *cp, const char *fp, size_t count)``
+ * @receive_buf2: [DRV] ``ssize_t ()(struct tty_struct *tty, const u8 *cp,
+ *                     const char *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
@@ -204,8 +204,8 @@ int ldsem_down_write_nested(struct ld_semaphore *sem, int subclass,
  *
  *     Optional.
  *
- * @lookahead_buf: [DRV] ``void ()(struct tty_struct *tty,
- *                     const unsigned char *cp, const char *fp, size_t count)``
+ * @lookahead_buf: [DRV] ``void ()(struct tty_struct *tty, const u8 *cp,
+ *                      const char *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
@@ -255,13 +255,13 @@ struct tty_ldisc_ops {
        /*
         * The following routines are called from below.
         */
-       void    (*receive_buf)(struct tty_struct *tty, const unsigned char *cp,
+       void    (*receive_buf)(struct tty_struct *tty, const u8 *cp,
                               const char *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 unsigned char *cp,
+       size_t  (*receive_buf2)(struct tty_struct *tty, const u8 *cp,
                                const char *fp, size_t count);
-       void    (*lookahead_buf)(struct tty_struct *tty, const unsigned char *cp,
+       void    (*lookahead_buf)(struct tty_struct *tty, const u8 *cp,
                                 const unsigned char *fp, size_t count);
 
        struct  module *owner;

diff --git a/sound/soc/codecs/cx20442.c b/sound/soc/codecs/cx20442.c
index 42cc863cbd53d57beab75370c27533896b2d261d..6d4938e3cbad4cef0807862626dca41787a96130 100644 (file)
--- a/sound/soc/codecs/cx20442.c
+++ b/sound/soc/codecs/cx20442.c
@@ -258,8 +258,8 @@ static void v253_hangup(struct tty_struct *tty)
 }
 
 /* Line discipline .receive_buf() */
-static void v253_receive(struct tty_struct *tty, const unsigned char *cp,
-                        const char *fp, size_t count)
+static void v253_receive(struct tty_struct *tty, const u8 *cp, const char *fp,
+                        size_t count)
 {
        struct snd_soc_component *component = tty->disc_data;
        struct cx20442_priv *cx20442;

diff --git a/sound/soc/ti/ams-delta.c b/sound/soc/ti/ams-delta.c
index 1028b5efcfff84247e732cb28d29883f9a064d2d..371943350fdf9b09c1e0e9d1fa4e2e3dc2fb7f59 100644 (file)
--- a/sound/soc/ti/ams-delta.c
+++ b/sound/soc/ti/ams-delta.c
@@ -336,7 +336,7 @@ static void cx81801_hangup(struct tty_struct *tty)
 }
 
 /* Line discipline .receive_buf() */
-static void cx81801_receive(struct tty_struct *tty, const unsigned char *cp,
+static void cx81801_receive(struct tty_struct *tty, const u8 *cp,
                const char *fp, int count)
 {
        struct snd_soc_component *component = tty->disc_data;