123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154 |
- From aed3ba0acb2c355be562cfbdb3a375682412c144 Mon Sep 17 00:00:00 2001
- From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
- Date: Tue, 31 Dec 2024 10:28:41 +0100
- Subject: [PATCH] tty/module.c: mark internal functions as static
- MIME-Version: 1.0
- Content-Type: text/plain; charset=UTF-8
- Content-Transfer-Encoding: 8bit
- Fixes:
- /home/autobuild/autobuild/instance-7/output-1/build/igh-ethercat-1.6.2/./tty/module.c:128:12: warning: no previous prototype for ‘ec_tty_init_module’ [-Wmissing-prototypes]
- 128 | int __init ec_tty_init_module(void)
- | ^~~~~~~~~~~~~~~~~~
- /home/autobuild/autobuild/instance-7/output-1/build/igh-ethercat-1.6.2/./tty/module.c:189:13: warning: no previous prototype for ‘ec_tty_cleanup_module’ [-Wmissing-prototypes]
- 189 | void __exit ec_tty_cleanup_module(void)
- | ^~~~~~~~~~~~~~~~~~~~~
- /home/autobuild/autobuild/instance-7/output-1/build/igh-ethercat-1.6.2/./tty/module.c:216:5: warning: no previous prototype for ‘ec_tty_init’ [-Wmissing-prototypes]
- 216 | int ec_tty_init(ec_tty_t *t, int minor,
- | ^~~~~~~~~~~
- /home/autobuild/autobuild/instance-7/output-1/build/igh-ethercat-1.6.2/./tty/module.c:293:6: warning: no previous prototype for ‘ec_tty_clear’ [-Wmissing-prototypes]
- 293 | void ec_tty_clear(ec_tty_t *tty)
- | ^~~~~~~~~~~~
- /home/autobuild/autobuild/instance-7/output-1/build/igh-ethercat-1.6.2/./tty/module.c:301:14: warning: no previous prototype for ‘ec_tty_tx_size’ [-Wmissing-prototypes]
- 301 | unsigned int ec_tty_tx_size(ec_tty_t *tty)
- | ^~~~~~~~~~~~~~
- /home/autobuild/autobuild/instance-7/output-1/build/igh-ethercat-1.6.2/./tty/module.c:316:14: warning: no previous prototype for ‘ec_tty_tx_space’ [-Wmissing-prototypes]
- 316 | unsigned int ec_tty_tx_space(ec_tty_t *tty)
- | ^~~~~~~~~~~~~~~
- /home/autobuild/autobuild/instance-7/output-1/build/igh-ethercat-1.6.2/./tty/module.c:323:14: warning: no previous prototype for ‘ec_tty_rx_size’ [-Wmissing-prototypes]
- 323 | unsigned int ec_tty_rx_size(ec_tty_t *tty)
- | ^~~~~~~~~~~~~~
- /home/autobuild/autobuild/instance-7/output-1/build/igh-ethercat-1.6.2/./tty/module.c:338:14: warning: no previous prototype for ‘ec_tty_rx_space’ [-Wmissing-prototypes]
- 338 | unsigned int ec_tty_rx_space(ec_tty_t *tty)
- | ^~~~~~~~~~~~~~~
- /home/autobuild/autobuild/instance-7/output-1/build/igh-ethercat-1.6.2/./tty/module.c:345:5: warning: no previous prototype for ‘ec_tty_get_serial_info’ [-Wmissing-prototypes]
- 345 | int ec_tty_get_serial_info(ec_tty_t *tty, struct serial_struct *data)
- | ^~~~~~~~~~~~~~~~~~~~~~
- Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
- Upstream: https://gitlab.com/etherlab.org/ethercat/-/merge_requests/150
- ---
- tty/module.c | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
- diff --git a/tty/module.c b/tty/module.c
- index 05486940..af4c1b70 100644
- --- a/tty/module.c
- +++ b/tty/module.c
- @@ -64,9 +64,9 @@ ec_tty_t *ttys[EC_TTY_MAX_DEVICES];
- struct semaphore tty_sem;
-
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
- -void ec_tty_wakeup(struct timer_list *);
- +static void ec_tty_wakeup(struct timer_list *);
- #else
- -void ec_tty_wakeup(unsigned long);
- +static void ec_tty_wakeup(unsigned long);
- #endif
-
- /****************************************************************************/
- @@ -125,7 +125,7 @@ static const struct tty_operations ec_tty_ops; // see below
- *
- * \return 0 on success, else < 0
- */
- -int __init ec_tty_init_module(void)
- +static int __init ec_tty_init_module(void)
- {
- int i, ret = 0;
- unsigned flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
- @@ -186,7 +186,7 @@ out_return:
- *
- * Clears all master instances.
- */
- -void __exit ec_tty_cleanup_module(void)
- +static void __exit ec_tty_cleanup_module(void)
- {
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0)
- int i;
- @@ -213,7 +213,7 @@ void __exit ec_tty_cleanup_module(void)
- * ec_tty_t methods.
- ****************************************************************************/
-
- -int ec_tty_init(ec_tty_t *t, int minor,
- +static int ec_tty_init(ec_tty_t *t, int minor,
- const ec_tty_operations_t *ops, void *cb_data)
- {
- int ret;
- @@ -290,7 +290,7 @@ int ec_tty_init(ec_tty_t *t, int minor,
-
- /****************************************************************************/
-
- -void ec_tty_clear(ec_tty_t *tty)
- +static void ec_tty_clear(ec_tty_t *tty)
- {
- del_timer_sync(&tty->timer);
- tty_unregister_device(tty_driver, tty->minor);
- @@ -298,7 +298,7 @@ void ec_tty_clear(ec_tty_t *tty)
-
- /****************************************************************************/
-
- -unsigned int ec_tty_tx_size(ec_tty_t *tty)
- +static unsigned int ec_tty_tx_size(ec_tty_t *tty)
- {
- unsigned int ret;
-
- @@ -313,14 +313,14 @@ unsigned int ec_tty_tx_size(ec_tty_t *tty)
-
- /****************************************************************************/
-
- -unsigned int ec_tty_tx_space(ec_tty_t *tty)
- +static unsigned int ec_tty_tx_space(ec_tty_t *tty)
- {
- return EC_TTY_TX_BUFFER_SIZE - 1 - ec_tty_tx_size(tty);
- }
-
- /****************************************************************************/
-
- -unsigned int ec_tty_rx_size(ec_tty_t *tty)
- +static unsigned int ec_tty_rx_size(ec_tty_t *tty)
- {
- unsigned int ret;
-
- @@ -335,14 +335,14 @@ unsigned int ec_tty_rx_size(ec_tty_t *tty)
-
- /****************************************************************************/
-
- -unsigned int ec_tty_rx_space(ec_tty_t *tty)
- +static unsigned int ec_tty_rx_space(ec_tty_t *tty)
- {
- return EC_TTY_RX_BUFFER_SIZE - 1 - ec_tty_rx_size(tty);
- }
-
- /****************************************************************************/
-
- -int ec_tty_get_serial_info(ec_tty_t *tty, struct serial_struct *data)
- +static int ec_tty_get_serial_info(ec_tty_t *tty, struct serial_struct *data)
- {
- struct serial_struct tmp;
-
- @@ -362,9 +362,9 @@ int ec_tty_get_serial_info(ec_tty_t *tty, struct serial_struct *data)
- /** Timer function.
- */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
- -void ec_tty_wakeup(struct timer_list *t)
- +static void ec_tty_wakeup(struct timer_list *t)
- #else
- -void ec_tty_wakeup(unsigned long data)
- +static void ec_tty_wakeup(unsigned long data)
- #endif
- {
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
- --
- 2.47.1
|