iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tty: make fp of tty_ldisc_ops::receive_buf{,2} const

Browse Source 
Char pointer (cp) passed to tty_ldisc_ops::receive_buf{,2} is const.
There is no reason for flag pointer (fp) not to be too. So switch it in
the definition and all uses.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
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: Jakub Kicinski <kuba@kernel.org>
Cc: Wolfgang Grandegger <wg@grandegger.com>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: Andreas Koensgen <ajk@comnets.uni-bremen.de>
Cc: Paul Mackerras <paulus@samba.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>
Cc: Peter Ujfalusi <peter.ujfalusi@gmail.com>
Link: https://lore.kernel.org/r/20210505091928.22010-12-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby
2021-05-05 11:19:04 +02:00
committed by Greg Kroah-Hartman
parent fc0df90b78
commit 0f3dcf3b5d
21 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/accessibility/speakup/spk_ttyio.c
View File

@ -72,7 +72,8 @@ static void spk_ttyio_ldisc_close(struct tty_struct *tty)
} }
static int spk_ttyio_receive_buf2(struct tty_struct *tty, static int spk_ttyio_receive_buf2(struct tty_struct *tty,
const unsigned char *cp, char *fp, int count) const unsigned char *cp,
const char *fp, int count)
{ {
struct spk_ldisc_data *ldisc_data = tty->disc_data; struct spk_ldisc_data *ldisc_data = tty->disc_data;
struct spk_synth *synth = ldisc_data->synth; struct spk_synth *synth = ldisc_data->synth;

2
drivers/bluetooth/hci_ldisc.c
View File

@ -593,7 +593,7 @@ static void hci_uart_tty_wakeup(struct tty_struct *tty)
* Return Value: None * Return Value: None
*/ */
static void hci_uart_tty_receive(struct tty_struct *tty, const u8 *data, static void hci_uart_tty_receive(struct tty_struct *tty, const u8 *data,
char *flags, int count) const char *flags, int count)
{ {
struct hci_uart *hu = tty->disc_data; struct hci_uart *hu = tty->disc_data;

3
drivers/input/serio/serport.c
View File

@ -114,7 +114,8 @@ static void serport_ldisc_close(struct tty_struct *tty)
* 'interrupt' routine. * 'interrupt' routine.
*/ */
static void serport_ldisc_receive(struct tty_struct *tty, const unsigned char *cp, char *fp, int count) static void serport_ldisc_receive(struct tty_struct *tty,
const unsigned char *cp, const char *fp, int count)
{ {
struct serport *serport = (struct serport*) tty->disc_data; struct serport *serport = (struct serport*) tty->disc_data;
unsigned long flags; unsigned long flags;

2
drivers/misc/ti-st/st_core.c
View File

@ -798,7 +798,7 @@ static void st_tty_close(struct tty_struct *tty)
} }
static void st_tty_receive(struct tty_struct *tty, const unsigned char *data, static void st_tty_receive(struct tty_struct *tty, const unsigned char *data,
char *tty_flags, int count) const char *tty_flags, int count)
{ {
#ifdef VERBOSE #ifdef VERBOSE
print_hex_dump(KERN_DEBUG, ">in>", DUMP_PREFIX_NONE, print_hex_dump(KERN_DEBUG, ">in>", DUMP_PREFIX_NONE,

2
drivers/net/caif/caif_serial.c
View File

@ -159,7 +159,7 @@ static inline void debugfs_tx(struct ser_device *ser, const u8 *data, int size)
#endif #endif
static void ldisc_receive(struct tty_struct *tty, const u8 *data, static void ldisc_receive(struct tty_struct *tty, const u8 *data,
char *flags, int count) const char *flags, int count)
{ {
struct sk_buff *skb = NULL; struct sk_buff *skb = NULL;
struct ser_device *ser; struct ser_device *ser;

3
drivers/net/can/slcan.c
View File

@ -467,7 +467,8 @@ static void slc_setup(struct net_device *dev)
*/ */
static void slcan_receive_buf(struct tty_struct *tty, static void slcan_receive_buf(struct tty_struct *tty,
const unsigned char *cp, char *fp, int count) const unsigned char *cp, const char *fp,
int count)
{ {
struct slcan *sl = (struct slcan *) tty->disc_data; struct slcan *sl = (struct slcan *) tty->disc_data;

2
drivers/net/hamradio/6pack.c
View File

@ -428,7 +428,7 @@ out:
* and sent on to some IP layer for further processing. * and sent on to some IP layer for further processing.
*/ */
static void sixpack_receive_buf(struct tty_struct *tty, static void sixpack_receive_buf(struct tty_struct *tty,
const unsigned char *cp, char *fp, int count) const unsigned char *cp, const char *fp, int count)
{ {
struct sixpack *sp; struct sixpack *sp;
int count1; int count1;

2
drivers/net/hamradio/mkiss.c
View File

@ -871,7 +871,7 @@ static int mkiss_ioctl(struct tty_struct *tty, struct file *file,
* and sent on to the AX.25 layer for further processing. * 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 unsigned char *cp,
char *fp, int count) const char *fp, int count)
{ {
struct mkiss *ax = mkiss_get(tty); struct mkiss *ax = mkiss_get(tty);

6
drivers/net/ppp/ppp_async.c
View File

@ -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 int ppp_async_push(struct asyncppp *ap);
static void ppp_async_flush_output(struct asyncppp *ap); static void ppp_async_flush_output(struct asyncppp *ap);
static void ppp_async_input(struct asyncppp *ap, const unsigned char *buf, static void ppp_async_input(struct asyncppp *ap, const unsigned char *buf,
char *flags, int count); const char *flags, int count);
static int ppp_async_ioctl(struct ppp_channel *chan, unsigned int cmd, static int ppp_async_ioctl(struct ppp_channel *chan, unsigned int cmd,
unsigned long arg); unsigned long arg);
static void ppp_async_process(struct tasklet_struct *t); static void ppp_async_process(struct tasklet_struct *t);
@ -340,7 +340,7 @@ ppp_asynctty_poll(struct tty_struct *tty, struct file *file, poll_table *wait)
/* May sleep, don't call from interrupt level or with interrupts disabled */ /* May sleep, don't call from interrupt level or with interrupts disabled */
static void static void
ppp_asynctty_receive(struct tty_struct *tty, const unsigned char *buf, ppp_asynctty_receive(struct tty_struct *tty, const unsigned char *buf,
char *cflags, int count) const char *cflags, int count)
{ {
struct asyncppp *ap = ap_get(tty); struct asyncppp *ap = ap_get(tty);
unsigned long flags; unsigned long flags;
@ -829,7 +829,7 @@ process_input_packet(struct asyncppp *ap)
static void static void
ppp_async_input(struct asyncppp *ap, const unsigned char *buf, ppp_async_input(struct asyncppp *ap, const unsigned char *buf,
char *flags, int count) const char *flags, int count)
{ {
struct sk_buff *skb; struct sk_buff *skb;
int c, i, j, n, s, f; int c, i, j, n, s, f;

6
drivers/net/ppp/ppp_synctty.c
View File

@ -94,7 +94,7 @@ static void ppp_sync_process(struct tasklet_struct *t);
static int ppp_sync_push(struct syncppp *ap); static int ppp_sync_push(struct syncppp *ap);
static void ppp_sync_flush_output(struct syncppp *ap); static void ppp_sync_flush_output(struct syncppp *ap);
static void ppp_sync_input(struct syncppp *ap, const unsigned char *buf, static void ppp_sync_input(struct syncppp *ap, const unsigned char *buf,
char *flags, int count); const char *flags, int count);
static const struct ppp_channel_ops sync_ops = { static const struct ppp_channel_ops sync_ops = {
.start_xmit = ppp_sync_send, .start_xmit = ppp_sync_send,
@ -333,7 +333,7 @@ ppp_sync_poll(struct tty_struct *tty, struct file *file, poll_table *wait)
/* May sleep, don't call from interrupt level or with interrupts disabled */ /* May sleep, don't call from interrupt level or with interrupts disabled */
static void static void
ppp_sync_receive(struct tty_struct *tty, const unsigned char *buf, ppp_sync_receive(struct tty_struct *tty, const unsigned char *buf,
char *cflags, int count) const char *cflags, int count)
{ {
struct syncppp *ap = sp_get(tty); struct syncppp *ap = sp_get(tty);
unsigned long flags; unsigned long flags;
@ -665,7 +665,7 @@ ppp_sync_flush_output(struct syncppp *ap)
*/ */
static void static void
ppp_sync_input(struct syncppp *ap, const unsigned char *buf, ppp_sync_input(struct syncppp *ap, const unsigned char *buf,
char *flags, int count) const char *flags, int count)
{ {
struct sk_buff *skb; struct sk_buff *skb;
unsigned char *p; unsigned char *p;

2
drivers/net/slip/slip.c
View File

@ -685,7 +685,7 @@ static void sl_setup(struct net_device *dev)
*/ */
static void slip_receive_buf(struct tty_struct *tty, const unsigned char *cp, static void slip_receive_buf(struct tty_struct *tty, const unsigned char *cp,
char *fp, int count) const char *fp, int count)
{ {
struct slip *sl = tty->disc_data; struct slip *sl = tty->disc_data;

2
drivers/tty/n_gsm.c
View File

@ -2424,7 +2424,7 @@ static void gsmld_detach_gsm(struct tty_struct *tty, struct gsm_mux *gsm)
} }
static void gsmld_receive_buf(struct tty_struct *tty, const unsigned char *cp, static void gsmld_receive_buf(struct tty_struct *tty, const unsigned char *cp,
char *fp, int count) const char *fp, int count)
{ {
struct gsm_mux *gsm = tty->disc_data; struct gsm_mux *gsm = tty->disc_data;
char flags = TTY_NORMAL; char flags = TTY_NORMAL;

2
drivers/tty/n_hdlc.c
View File

@ -358,7 +358,7 @@ static void n_hdlc_tty_wakeup(struct tty_struct *tty)
* interpreted as one HDLC frame. * 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,
char *flags, int count) const char *flags, int count)
{ {
register struct n_hdlc *n_hdlc = tty->disc_data; register struct n_hdlc *n_hdlc = tty->disc_data;
register struct n_hdlc_buf *buf; register struct n_hdlc_buf *buf;

2
drivers/tty/n_null.c
View File

@ -33,7 +33,7 @@ static ssize_t n_null_write(struct tty_struct *tty, struct file *file,
} }
static void n_null_receivebuf(struct tty_struct *tty, static void n_null_receivebuf(struct tty_struct *tty,
const unsigned char *cp, char *fp, const unsigned char *cp, const char *fp,
int cnt) int cnt)
{ {
} }

16
drivers/tty/n_tty.c
View File

@ -1474,7 +1474,7 @@ n_tty_receive_char_lnext(struct tty_struct *tty, unsigned char c, char flag)
static void static void
n_tty_receive_buf_real_raw(struct tty_struct *tty, const unsigned char *cp, n_tty_receive_buf_real_raw(struct tty_struct *tty, const unsigned char *cp,
char *fp, int count) const char *fp, int count)
{ {
struct n_tty_data *ldata = tty->disc_data; struct n_tty_data *ldata = tty->disc_data;
size_t n, head; size_t n, head;
@ -1494,7 +1494,7 @@ n_tty_receive_buf_real_raw(struct tty_struct *tty, const unsigned char *cp,
static void 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 unsigned char *cp,
char *fp, int count) const char *fp, int count)
{ {
struct n_tty_data *ldata = tty->disc_data; struct n_tty_data *ldata = tty->disc_data;
char flag = TTY_NORMAL; char flag = TTY_NORMAL;
@ -1511,7 +1511,7 @@ n_tty_receive_buf_raw(struct tty_struct *tty, const unsigned char *cp,
static void 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 unsigned char *cp,
char *fp, int count) const char *fp, int count)
{ {
char flag = TTY_NORMAL; char flag = TTY_NORMAL;
@ -1524,7 +1524,7 @@ n_tty_receive_buf_closing(struct tty_struct *tty, const unsigned char *cp,
} }
static void n_tty_receive_buf_standard(struct tty_struct *tty, static void n_tty_receive_buf_standard(struct tty_struct *tty,
const unsigned char *cp, char *fp, int count) const unsigned char *cp, const char *fp, int count)
{ {
struct n_tty_data *ldata = tty->disc_data; struct n_tty_data *ldata = tty->disc_data;
char flag = TTY_NORMAL; char flag = TTY_NORMAL;
@ -1562,7 +1562,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 unsigned char *cp,
char *fp, int count) const char *fp, int count)
{ {
struct n_tty_data *ldata = tty->disc_data; struct n_tty_data *ldata = tty->disc_data;
bool preops = I_ISTRIP(tty) || (I_IUCLC(tty) && L_IEXTEN(tty)); bool preops = I_ISTRIP(tty) || (I_IUCLC(tty) && L_IEXTEN(tty));
@ -1629,7 +1629,7 @@ static void __receive_buf(struct tty_struct *tty, const unsigned char *cp,
*/ */
static int static int
n_tty_receive_buf_common(struct tty_struct *tty, const unsigned char *cp, n_tty_receive_buf_common(struct tty_struct *tty, const unsigned char *cp,
char *fp, int count, int flow) const char *fp, int count, int flow)
{ {
struct n_tty_data *ldata = tty->disc_data; struct n_tty_data *ldata = tty->disc_data;
int room, n, rcvd = 0, overflow; int room, n, rcvd = 0, overflow;
@ -1698,13 +1698,13 @@ n_tty_receive_buf_common(struct tty_struct *tty, const unsigned char *cp,
} }
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 unsigned char *cp,
char *fp, int count) const char *fp, int count)
{ {
n_tty_receive_buf_common(tty, cp, fp, count, 0); n_tty_receive_buf_common(tty, cp, fp, count, 0);
} }
static int n_tty_receive_buf2(struct tty_struct *tty, const unsigned char *cp, static int n_tty_receive_buf2(struct tty_struct *tty, const unsigned char *cp,
char *fp, int count) const char *fp, int count)
{ {
return n_tty_receive_buf_common(tty, cp, fp, count, 1); return n_tty_receive_buf_common(tty, cp, fp, count, 1);
} }

4
drivers/tty/tty_buffer.c
View File

@ -455,7 +455,7 @@ EXPORT_SYMBOL_GPL(tty_prepare_flip_string);
* Returns the number of bytes processed * Returns the number of bytes processed
*/ */
int tty_ldisc_receive_buf(struct tty_ldisc *ld, const unsigned char *p, int tty_ldisc_receive_buf(struct tty_ldisc *ld, const unsigned char *p,
char *f, int count) const char *f, int count)
{ {
if (ld->ops->receive_buf2) if (ld->ops->receive_buf2)
count = ld->ops->receive_buf2(ld->tty, p, f, count); count = ld->ops->receive_buf2(ld->tty, p, f, count);
@ -472,7 +472,7 @@ static int
receive_buf(struct tty_port *port, struct tty_buffer *head, int count) receive_buf(struct tty_port *port, struct tty_buffer *head, int count)
{ {
unsigned char *p = char_buf_ptr(head, head->read); unsigned char *p = char_buf_ptr(head, head->read);
char *f = NULL; const char *f = NULL;
int n; int n;
if (~head->flags & TTYB_NORMAL) if (~head->flags & TTYB_NORMAL)

2
include/linux/tty.h
View File

@ -628,7 +628,7 @@ extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
extern int tty_unregister_ldisc(int disc); extern int tty_unregister_ldisc(int disc);
extern int tty_set_ldisc(struct tty_struct *tty, int disc); extern int tty_set_ldisc(struct tty_struct *tty, int disc);
extern int tty_ldisc_receive_buf(struct tty_ldisc *ld, const unsigned char *p, extern int tty_ldisc_receive_buf(struct tty_ldisc *ld, const unsigned char *p,
char *f, int count); const char *f, int count);
/* n_tty.c */ /* n_tty.c */
extern void n_tty_inherit_ops(struct tty_ldisc_ops *ops); extern void n_tty_inherit_ops(struct tty_ldisc_ops *ops);

4
include/linux/tty_ldisc.h
View File

@ -201,11 +201,11 @@ struct tty_ldisc_ops {
* The following routines are called from below. * The following routines are called from below.
*/ */
void (*receive_buf)(struct tty_struct *, const unsigned char *cp, void (*receive_buf)(struct tty_struct *, const unsigned char *cp,
char *fp, int count); const char *fp, int count);
void (*write_wakeup)(struct tty_struct *); void (*write_wakeup)(struct tty_struct *);
void (*dcd_change)(struct tty_struct *, unsigned int); void (*dcd_change)(struct tty_struct *, unsigned int);
int (*receive_buf2)(struct tty_struct *, const unsigned char *cp, int (*receive_buf2)(struct tty_struct *, const unsigned char *cp,
char *fp, int count); const char *fp, int count);
struct module *owner; struct module *owner;

2
net/nfc/nci/uart.c
View File

@ -308,7 +308,7 @@ static int nci_uart_default_recv_buf(struct nci_uart *nu, const u8 *data,
* Return Value: None * Return Value: None
*/ */
static void nci_uart_tty_receive(struct tty_struct *tty, const u8 *data, static void nci_uart_tty_receive(struct tty_struct *tty, const u8 *data,
char *flags, int count) const char *flags, int count)
{ {
struct nci_uart *nu = (void *)tty->disc_data; struct nci_uart *nu = (void *)tty->disc_data;

4
sound/soc/codecs/cx20442.c
View File

@ -259,8 +259,8 @@ static int v253_hangup(struct tty_struct *tty)
} }
/* Line discipline .receive_buf() */ /* Line discipline .receive_buf() */
static void v253_receive(struct tty_struct *tty, static void v253_receive(struct tty_struct *tty, const unsigned char *cp,
const unsigned char *cp, char *fp, int count) const char *fp, int count)
{ {
struct snd_soc_component *component = tty->disc_data; struct snd_soc_component *component = tty->disc_data;
struct cx20442_priv *cx20442; struct cx20442_priv *cx20442;

4
sound/soc/ti/ams-delta.c
View File

@ -337,8 +337,8 @@ static int cx81801_hangup(struct tty_struct *tty)
} }
/* Line discipline .receive_buf() */ /* Line discipline .receive_buf() */
static void cx81801_receive(struct tty_struct *tty, static void cx81801_receive(struct tty_struct *tty, const unsigned char *cp,
const unsigned char *cp, char *fp, int count) const char *fp, int count)
{ {
struct snd_soc_component *component = tty->disc_data; struct snd_soc_component *component = tty->disc_data;
const unsigned char *c; const unsigned char *c;