From 673845eba07d20db6b68edf8514c6fed1f68174b Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 16 Jan 2018 18:01:56 -0600 Subject: [PATCH] Remove all references to the now non-existent boardctl(BOARD_TSCTEST_TEARDOWN). --- examples/README.txt | 3 +-- examples/touchscreen/Kconfig | 7 +++---- examples/touchscreen/tc_main.c | 7 +------ 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/examples/README.txt b/examples/README.txt index 4a2675c73..787516f11 100644 --- a/examples/README.txt +++ b/examples/README.txt @@ -1993,10 +1993,9 @@ examples/touchscreen This example code will call boardctl() to setup the touchscreen driver for texting. The implementation of boardctl() will require that board- specific logic provide the following interfaces that will be called by - the boardctl() in order to initialize and uninitialize the touchscreen hardware: + the boardctl() in order to initialize the touchscreen hardware: int board_tsc_setup(int minor); - void board_tsc_teardown(void); examples/uavcan ^^^^^^^^^^^^^^^ diff --git a/examples/touchscreen/Kconfig b/examples/touchscreen/Kconfig index 7b82f89ca..0801675d4 100644 --- a/examples/touchscreen/Kconfig +++ b/examples/touchscreen/Kconfig @@ -61,9 +61,8 @@ config EXAMPLES_TOUCHSCREEN_ARCHINIT mouse is disconnected. So, in cases like this, there are two options: (1) provide dummy - board_tsc_setup() and board_tsc_teardown() just to satisfy the - linking requirements of boardctl() or, (2) de-select this option. - If this option is de-selected, then the boardctl() will never be - called. + board_tsc_setup() just to satisfy the linking requirements of + boardctl() or, (2) de-select this option. If this option is de- + selected, then the boardctl() will never be called. endif diff --git a/examples/touchscreen/tc_main.c b/examples/touchscreen/tc_main.c index fa0713c1a..4b1a9cf6f 100644 --- a/examples/touchscreen/tc_main.c +++ b/examples/touchscreen/tc_main.c @@ -149,7 +149,7 @@ int tc_main(int argc, char *argv[]) printf("tc_main: open %s failed: %d\n", CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH, errno); errval = 2; - goto errout_with_tc; + goto errout; } /* Now loop the appropriate number of times, displaying the collected @@ -259,12 +259,7 @@ int tc_main(int argc, char *argv[]) errout_with_dev: close(fd); -errout_with_tc: -#ifdef CONFIG_EXAMPLES_TOUCHSCREEN_ARCHINIT - boardctl(BOARDIOC_TSCTEST_TEARDOWN, 0); - errout: -#endif printf("Terminating!\n"); fflush(stdout); return errval;