Commit b68e31d0 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds

[PATCH] const struct tty_operations

As part of an SMP cleanliness pass over UML, I consted a bunch of
structures in order to not have to document their locking.  One of these
structures was a struct tty_operations.  In order to const it in UML
without introducing compiler complaints, the declaration of
tty_set_operations needs to be changed, and then all of its callers need to
be fixed.

This patch declares all struct tty_operations in the tree as const.  In all
cases, they are static and used only as input to tty_set_operations.  As an
extra check, I ran an i386 allyesconfig build which produced no extra
warnings.

53 drivers are affected.  I checked the history of a bunch of them, and in
most cases, there have been only a handful of maintenance changes in the
last six months.  serial_core.c was the busiest one that I looked at.
Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Acked-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ed97bd37
......@@ -229,7 +229,7 @@ srmcons_close(struct tty_struct *tty, struct file *filp)
static struct tty_driver *srmcons_driver;
static struct tty_operations srmcons_ops = {
static const struct tty_operations srmcons_ops = {
.open = srmcons_open,
.close = srmcons_close,
.write = srmcons_write,
......
......@@ -940,7 +940,7 @@ static inline void show_serial_version(void)
printk(KERN_INFO " no serial options enabled\n");
}
static struct tty_operations hp_ops = {
static const struct tty_operations hp_ops = {
.open = rs_open,
.close = rs_close,
.write = rs_write,
......
......@@ -1720,7 +1720,7 @@ static int siccuart_open(struct tty_struct *tty, struct file *filp)
return 0;
}
static struct tty_operations sicc_ops = {
static const struct tty_operations sicc_ops = {
.open = siccuart_open,
.close = siccuart_close,
.write = siccuart_write,
......
......@@ -642,9 +642,9 @@ int line_remove(struct line *lines, unsigned int num, int n)
}
struct tty_driver *line_register_devfs(struct lines *set,
struct line_driver *line_driver,
struct tty_operations *ops, struct line *lines,
int nlines)
struct line_driver *line_driver,
const struct tty_operations *ops,
struct line *lines, int nlines)
{
int i;
struct tty_driver *driver = alloc_tty_driver(nlines);
......
......@@ -91,10 +91,9 @@ extern int line_setup_irq(int fd, int input, int output, struct line *line,
void *data);
extern void line_close_chan(struct line *line);
extern struct tty_driver * line_register_devfs(struct lines *set,
struct line_driver *line_driver,
struct tty_operations *driver,
struct line *lines,
int nlines);
struct line_driver *line_driver,
const struct tty_operations *driver,
struct line *lines, int nlines);
extern void lines_init(struct line *lines, int nlines, struct chan_opts *opts);
extern void close_lines(struct line *lines, int nlines);
......
......@@ -104,7 +104,7 @@ int memcons_tty_chars_in_buffer (struct tty_struct *tty)
return 0;
}
static struct tty_operations ops = {
static const struct tty_operations ops = {
.open = memcons_tty_open,
.write = memcons_tty_write,
.write_room = memcons_tty_write_room,
......
......@@ -77,7 +77,7 @@ int simcons_tty_chars_in_buffer (struct tty_struct *tty)
return 0;
}
static struct tty_operations ops = {
static const struct tty_operations ops = {
.open = simcons_tty_open,
.write = simcons_tty_write,
.write_room = simcons_tty_write_room,
......
......@@ -191,7 +191,7 @@ static int rs_read_proc(char *page, char **start, off_t off, int count,
}
static struct tty_operations serial_ops = {
static const struct tty_operations serial_ops = {
.open = rs_open,
.close = rs_close,
.write = rs_write,
......
......@@ -1958,7 +1958,7 @@ static void show_serial_version(void)
}
static struct tty_operations serial_ops = {
static const struct tty_operations serial_ops = {
.open = rs_open,
.close = rs_close,
.write = rs_write,
......
......@@ -5205,7 +5205,7 @@ done:
extra ports are ignored.
*/
static struct tty_operations cy_ops = {
static const struct tty_operations cy_ops = {
.open = cy_open,
.close = cy_close,
.write = cy_write,
......
......@@ -1125,7 +1125,7 @@ static void __exit epca_module_exit(void)
module_exit(epca_module_exit);
static struct tty_operations pc_ops = {
static const struct tty_operations pc_ops = {
.open = pc_open,
.close = pc_close,
.write = pc_write,
......
......@@ -2376,7 +2376,7 @@ static inline int autoconfig(struct esp_struct * info)
return (port_detected);
}
static struct tty_operations esp_ops = {
static const struct tty_operations esp_ops = {
.open = esp_open,
.close = rs_close,
.write = rs_write,
......
......@@ -696,7 +696,7 @@ int khvcd(void *unused)
return 0;
}
static struct tty_operations hvc_ops = {
static const struct tty_operations hvc_ops = {
.open = hvc_open,
.close = hvc_close,
.write = hvc_write,
......
......@@ -1306,7 +1306,7 @@ static int hvcs_chars_in_buffer(struct tty_struct *tty)
return hvcsd->chars_in_buffer;
}
static struct tty_operations hvcs_ops = {
static const struct tty_operations hvcs_ops = {
.open = hvcs_open,
.close = hvcs_close,
.hangup = hvcs_hangup,
......
......@@ -1130,7 +1130,7 @@ static int hvsi_tiocmset(struct tty_struct *tty, struct file *file,
}
static struct tty_operations hvsi_ops = {
static const struct tty_operations hvsi_ops = {
.open = hvsi_open,
.close = hvsi_close,
.write = hvsi_write,
......
......@@ -458,7 +458,7 @@ cleanup_module(void)
}
#endif /* MODULE */
static struct tty_operations ip2_ops = {
static const struct tty_operations ip2_ops = {
.open = ip2_open,
.close = ip2_close,
.write = ip2_write,
......
......@@ -1550,7 +1550,7 @@ static void isicom_unregister_ioregion(struct pci_dev *pdev)
board->base = 0;
}
static struct tty_operations isicom_ops = {
static const struct tty_operations isicom_ops = {
.open = isicom_open,
.close = isicom_close,
.write = isicom_write,
......
......@@ -4636,7 +4636,7 @@ static int stli_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, un
return rc;
}
static struct tty_operations stli_ops = {
static const struct tty_operations stli_ops = {
.open = stli_open,
.close = stli_close,
.write = stli_write,
......
......@@ -281,7 +281,7 @@ static int moxa_get_serial_info(struct moxa_str *, struct serial_struct __user *
static int moxa_set_serial_info(struct moxa_str *, struct serial_struct __user *);
static void MoxaSetFifo(int port, int enable);
static struct tty_operations moxa_ops = {
static const struct tty_operations moxa_ops = {
.open = moxa_open,
.close = moxa_close,
.write = moxa_write,
......
......@@ -453,7 +453,7 @@ static int CheckIsMoxaMust(int io)
/* above is modified by Victor Yu. 08-15-2002 */
static struct tty_operations mxser_ops = {
static const struct tty_operations mxser_ops = {
.open = mxser_open,
.close = mxser_close,
.write = mxser_write,
......
......@@ -3010,7 +3010,7 @@ static struct pcmcia_driver mgslpc_driver = {
.resume = mgslpc_resume,
};
static struct tty_operations mgslpc_ops = {
static const struct tty_operations mgslpc_ops = {
.open = mgslpc_open,
.close = mgslpc_close,
.write = mgslpc_write,
......
......@@ -224,7 +224,7 @@ static void pty_set_termios(struct tty_struct *tty, struct termios *old_termios)
tty->termios->c_cflag |= (CS8 | CREAD);
}
static struct tty_operations pty_ops = {
static const struct tty_operations pty_ops = {
.open = pty_open,
.close = pty_close,
.write = pty_write,
......
......@@ -727,7 +727,7 @@ static struct vpd_prom *get_VPD_PROM(struct Host *hp)
return &vpdp;
}
static struct tty_operations rio_ops = {
static const struct tty_operations rio_ops = {
.open = riotopen,
.close = gs_close,
.write = gs_write,
......
......@@ -1583,7 +1583,7 @@ static void do_softint(void *private_)
}
}
static struct tty_operations riscom_ops = {
static const struct tty_operations riscom_ops = {
.open = rc_open,
.close = rc_close,
.write = rc_write,
......
......@@ -2334,7 +2334,7 @@ static int __init init_ISA(int i)
return (1);
}
static struct tty_operations rocket_ops = {
static const struct tty_operations rocket_ops = {
.open = rp_open,
.close = rp_close,
.write = rp_write,
......
......@@ -661,7 +661,7 @@ static void a2232_init_portstructs(void)
}
}
static struct tty_operations a2232_ops = {
static const struct tty_operations a2232_ops = {
.open = a2232_open,
.close = gs_close,
.write = gs_write,
......
......@@ -2158,7 +2158,7 @@ mvme167_serial_console_setup(int cflag)
rcor >> 5, rbpr);
} /* serial_console_init */
static struct tty_operations cy_ops = {
static const struct tty_operations cy_ops = {
.open = cy_open,
.close = cy_close,
.write = cy_write,
......
......@@ -2363,7 +2363,7 @@ static void do_softint(void *private_)
func_exit();
}
static struct tty_operations sx_ops = {
static const struct tty_operations sx_ops = {
.open = sx_open,
.close = sx_close,
.write = sx_write,
......
......@@ -2993,7 +2993,7 @@ static int stl_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, uns
return(rc);
}
static struct tty_operations stl_ops = {
static const struct tty_operations stl_ops = {
.open = stl_open,
.close = stl_close,
.write = stl_write,
......
......@@ -2226,7 +2226,7 @@ static int probe_si (struct sx_board *board)
return 1;
}
static struct tty_operations sx_ops = {
static const struct tty_operations sx_ops = {
.break_ctl = sx_break,
.open = sx_open,
.close = gs_close,
......
......@@ -4360,7 +4360,7 @@ static struct mgsl_struct* mgsl_allocate_device(void)
} /* end of mgsl_allocate_device()*/
static struct tty_operations mgsl_ops = {
static const struct tty_operations mgsl_ops = {
.open = mgsl_open,
.close = mgsl_close,
.write = mgsl_write,
......
......@@ -3441,7 +3441,7 @@ static void __devexit remove_one(struct pci_dev *dev)
{
}
static struct tty_operations ops = {
static const struct tty_operations ops = {
.open = open,
.close = close,
.write = write,
......
......@@ -3929,7 +3929,7 @@ void device_init(int adapter_num, struct pci_dev *pdev)
}
}
static struct tty_operations ops = {
static const struct tty_operations ops = {
.open = open,
.close = close,
.write = write,
......
......@@ -3680,7 +3680,8 @@ void put_tty_driver(struct tty_driver *driver)
kfree(driver);
}
void tty_set_operations(struct tty_driver *driver, struct tty_operations *op)
void tty_set_operations(struct tty_driver *driver,
const struct tty_operations *op)
{
driver->open = op->open;
driver->close = op->close;
......
......@@ -1047,7 +1047,7 @@ static int send_open(HvLpIndex remoteLp, void *sem)
0, 0, 0, 0);
}
static struct tty_operations serial_ops = {
static const struct tty_operations serial_ops = {
.open = viotty_open,
.close = viotty_close,
.write = viotty_write,
......
......@@ -113,7 +113,7 @@ static struct real_driver scc_real_driver = {
};
static struct tty_operations scc_ops = {
static const struct tty_operations scc_ops = {
.open = scc_open,
.close = gs_close,
.write = gs_write,
......
......@@ -2675,7 +2675,7 @@ static int __init con_init(void)
}
console_initcall(con_init);
static struct tty_operations con_ops = {
static const struct tty_operations con_ops = {
.open = con_open,
.close = con_close,
.write = con_write,
......
......@@ -1298,7 +1298,7 @@ static int capinc_tty_read_proc(char *page, char **start, off_t off,
static struct tty_driver *capinc_tty_driver;
static struct tty_operations capinc_ops = {
static const struct tty_operations capinc_ops = {
.open = capinc_tty_open,
.close = capinc_tty_close,
.write = capinc_tty_write,
......
......@@ -134,7 +134,7 @@ static int if_tiocmset(struct tty_struct *tty, struct file *file,
static int if_write(struct tty_struct *tty,
const unsigned char *buf, int count);
static struct tty_operations if_ops = {
static const struct tty_operations if_ops = {
.open = if_open,
.close = if_close,
.ioctl = if_ioctl,
......
......@@ -1860,7 +1860,7 @@ modem_write_profile(atemu * m)
send_sig(SIGIO, dev->profd, 1);
}
static struct tty_operations modem_ops = {
static const struct tty_operations modem_ops = {
.open = isdn_tty_open,
.close = isdn_tty_close,
.write = isdn_tty_write,
......
......@@ -1103,7 +1103,7 @@ tty3215_start(struct tty_struct *tty)
}
}
static struct tty_operations tty3215_ops = {
static const struct tty_operations tty3215_ops = {
.open = tty3215_open,
.close = tty3215_close,
.write = tty3215_write,
......
......@@ -711,7 +711,7 @@ static struct sclp_register sclp_input_event =
.receiver_fn = sclp_tty_receiver
};
static struct tty_operations sclp_ops = {
static const struct tty_operations sclp_ops = {
.open = sclp_tty_open,
.close = sclp_tty_close,
.write = sclp_tty_write,
......
......@@ -655,7 +655,7 @@ __sclp_vt220_init(int early)
return 0;
}
static struct tty_operations sclp_vt220_ops = {
static const struct tty_operations sclp_vt220_ops = {
.open = sclp_vt220_open,
.close = sclp_vt220_close,
.write = sclp_vt220_write,
......
......@@ -1737,7 +1737,7 @@ tty3270_ioctl(struct tty_struct *tty, struct file *file,
return kbd_ioctl(tp->kbd, file, cmd, arg);
}
static struct tty_operations tty3270_ops = {
static const struct tty_operations tty3270_ops = {
.open = tty3270_open,
.close = tty3270_close,
.write = tty3270_write,
......
......@@ -2187,7 +2187,7 @@ static void do_softint(void *private_)
#endif
}
static struct tty_operations aurora_ops = {
static const struct tty_operations aurora_ops = {
.open = aurora_open,
.close = aurora_close,
.write = aurora_write,
......
......@@ -1378,7 +1378,7 @@ void startup_console(void)
#endif /* CONFIG_PM_LEGACY */
static struct tty_operations rs_ops = {
static const struct tty_operations rs_ops = {
.open = rs_open,
.close = rs_close,
.write = rs_write,
......
......@@ -2424,7 +2424,7 @@ long console_360_init(long kmem_start, long kmem_end)
*/
static int baud_idx;
static struct tty_operations rs_360_ops = {
static const struct tty_operations rs_360_ops = {
.owner = THIS_MODULE,
.open = rs_360_open,
.close = rs_360_close,
......
......@@ -4825,7 +4825,7 @@ show_serial_version(void)
/* rs_init inits the driver at boot (using the module_init chain) */
static struct tty_operations rs_ops = {
static const struct tty_operations rs_ops = {
.open = rs_open,
.close = rs_close,
.write = rs_write,
......
......@@ -1666,7 +1666,7 @@ static void show_serial_version(void)
printk(mcfrs_drivername);
}
static struct tty_operations mcfrs_ops = {
static const struct tty_operations mcfrs_ops = {
.open = mcfrs_open,
.close = mcfrs_close,
.write = mcfrs_write,
......
......@@ -2111,7 +2111,7 @@ uart_configure_port(struct uart_driver *drv, struct uart_state *state,
}
}
static struct tty_operations uart_ops = {
static const struct tty_operations uart_ops = {
.open = uart_open,
.close = uart_close,
.write = uart_write,
......
......@@ -1701,7 +1701,7 @@ static void __init probe_sccs(void)
spin_unlock_irqrestore(&zs_lock, flags);
}
static struct tty_operations serial_ops = {
static const struct tty_operations serial_ops = {
.open = rs_open,
.close = rs_close,
.write = rs_write,
......
......@@ -1120,7 +1120,7 @@ static struct usb_driver acm_driver = {
* TTY driver structures.
*/
static struct tty_operations acm_ops = {
static const struct tty_operations acm_ops = {
.open = acm_tty_open,
.close = acm_tty_close,
.write = acm_tty_write,
......
......@@ -271,7 +271,7 @@ static unsigned int use_acm = GS_DEFAULT_USE_ACM;
/* tty driver struct */
static struct tty_operations gs_tty_ops = {
static const struct tty_operations gs_tty_ops = {
.open = gs_open,
.close = gs_close,
.write = gs_write,
......
......@@ -1015,7 +1015,7 @@ void usb_serial_disconnect(struct usb_interface *interface)
dev_info(dev, "device disconnected\n");
}
static struct tty_operations serial_ops = {
static const struct tty_operations serial_ops = {
.open = serial_open,
.close = serial_close,
.write = serial_write,
......
......@@ -219,7 +219,8 @@ extern struct list_head tty_drivers;
struct tty_driver *alloc_tty_driver(int lines);
void put_tty_driver(struct tty_driver *driver);
void tty_set_operations(struct tty_driver *driver, struct tty_operations *op);
void tty_set_operations(struct tty_driver *driver,
const struct tty_operations *op);
/* tty driver magic number */
#define TTY_DRIVER_MAGIC 0x5402
......
......@@ -1011,7 +1011,7 @@ static int rfcomm_tty_tiocmset(struct tty_struct *tty, struct file *filp, unsign
/* ---- TTY structure ---- */
static struct tty_operations rfcomm_ops = {
static const struct tty_operations rfcomm_ops = {
.open = rfcomm_tty_open,
.close = rfcomm_tty_close,
.write = rfcomm_tty_write,
......
......@@ -79,7 +79,7 @@ static struct tty_driver *driver;
hashbin_t *ircomm_tty = NULL;
static struct tty_operations ops = {
static const struct tty_operations ops = {
.open = ircomm_tty_open,
.close = ircomm_tty_close,
.write = ircomm_tty_write,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment