diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-06-22 07:48:49 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-07-06 17:09:35 (GMT) |
| commit | 49ddcf3e0e923040ef554d9ea033e0d8ba7e80e1 (patch) | |
| tree | 39424324a20bd8d217a51240647959524193053c | |
| parent | 7e09145ea2e985511c660bdf567b61614acd75b3 (diff) | |
| download | u-boot-fsl-qoriq-49ddcf3e0e923040ef554d9ea033e0d8ba7e80e1.tar.xz | |
serial: make serial_stub_* to static functions
Add missing static to serial_stub_puts().
Unexport serial_stub_{getc,tstc} because they are used locally.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | drivers/serial/serial-uclass.c | 11 | ||||
| -rw-r--r-- | drivers/serial/serial.c | 4 | ||||
| -rw-r--r-- | include/common.h | 5 |
3 files changed, 9 insertions, 11 deletions
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c index a9c4f89..200f4b9 100644 --- a/drivers/serial/serial-uclass.c +++ b/drivers/serial/serial-uclass.c @@ -212,27 +212,30 @@ void serial_stdio_init(void) { } -#if defined(CONFIG_DM_STDIO) && CONFIG_IS_ENABLED(SERIAL_PRESENT) +#if defined(CONFIG_DM_STDIO) + +#if CONFIG_IS_ENABLED(SERIAL_PRESENT) static void serial_stub_putc(struct stdio_dev *sdev, const char ch) { _serial_putc(sdev->priv, ch); } #endif -void serial_stub_puts(struct stdio_dev *sdev, const char *str) +static void serial_stub_puts(struct stdio_dev *sdev, const char *str) { _serial_puts(sdev->priv, str); } -int serial_stub_getc(struct stdio_dev *sdev) +static int serial_stub_getc(struct stdio_dev *sdev) { return _serial_getc(sdev->priv); } -int serial_stub_tstc(struct stdio_dev *sdev) +static int serial_stub_tstc(struct stdio_dev *sdev) { return _serial_tstc(sdev->priv); } +#endif /** * on_baudrate() - Update the actual baudrate when the env var changes diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c index f2bd0e4..87542f9 100644 --- a/drivers/serial/serial.c +++ b/drivers/serial/serial.c @@ -273,14 +273,14 @@ static void serial_stub_puts(struct stdio_dev *sdev, const char *str) dev->puts(str); } -int serial_stub_getc(struct stdio_dev *sdev) +static int serial_stub_getc(struct stdio_dev *sdev) { struct serial_device *dev = sdev->priv; return dev->getc(); } -int serial_stub_tstc(struct stdio_dev *sdev) +static int serial_stub_tstc(struct stdio_dev *sdev) { struct serial_device *dev = sdev->priv; diff --git a/include/common.h b/include/common.h index 638c45b..1a98512 100644 --- a/include/common.h +++ b/include/common.h @@ -490,11 +490,6 @@ void serial_puts (const char *); int serial_getc (void); int serial_tstc (void); -/* These versions take a stdio_dev pointer */ -struct stdio_dev; -int serial_stub_getc(struct stdio_dev *sdev); -int serial_stub_tstc(struct stdio_dev *sdev); - /* $(CPU)/speed.c */ int get_clocks (void); ulong get_bus_freq (ulong); |