diff options
| author | Tom Rini <trini@konsulko.com> | 2022-02-10 17:02:06 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-02-10 17:19:44 +0300 |
| commit | 2ccd2bc8c3580e00c51094c5cc2b3e2ead8d35c3 (patch) | |
| tree | 4e7349b8831fee4b342a971025273d3cd042a2f9 /drivers | |
| parent | 6662e5e406fdee26ba981dd4af3308f51f254f0a (diff) | |
| parent | f3078d4ea707931c2307a623ecf6e4d215b413d5 (diff) | |
| download | u-boot-2ccd2bc8c3580e00c51094c5cc2b3e2ead8d35c3.tar.xz | |
Merge tag 'dm-pull-8feb22-take3' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
patman snake-case conversion
binman fit improvements
ACPI fixes and making MCFG available to ARM
[trini: Update scripts/pylint.base]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/serial-uclass.c | 2 | ||||
| -rw-r--r-- | drivers/serial/serial_nulldev.c | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c index 96a1cb65ba..362cedd955 100644 --- a/drivers/serial/serial-uclass.c +++ b/drivers/serial/serial-uclass.c @@ -357,7 +357,6 @@ static void serial_stub_putc(struct stdio_dev *sdev, const char ch) { _serial_putc(sdev->priv, ch); } -#endif static void serial_stub_puts(struct stdio_dev *sdev, const char *str) { @@ -374,6 +373,7 @@ static int serial_stub_tstc(struct stdio_dev *sdev) return _serial_tstc(sdev->priv); } #endif +#endif /** * on_baudrate() - Update the actual baudrate when the env var changes diff --git a/drivers/serial/serial_nulldev.c b/drivers/serial/serial_nulldev.c index efae14dd6c..f3ca7f5255 100644 --- a/drivers/serial/serial_nulldev.c +++ b/drivers/serial/serial_nulldev.c @@ -22,11 +22,6 @@ static int nulldev_serial_pending(struct udevice *dev, bool input) return 0; } -static int nulldev_serial_input(struct udevice *dev) -{ - return 0; -} - static int nulldev_serial_putc(struct udevice *dev, const char ch) { return 0; |