The patch titled blackfin serial driver: use the DLAB macro to hide variant differences has been added to the -mm tree. Its filename is blackfin-serial-driver-use-the-dlab-macro-to-hide-variant-differences.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: blackfin serial driver: use the DLAB macro to hide variant differences From: Mike Frysinger <vapier.adi@xxxxxxxxx> Signed-off-by: Mike Frysinger <vapier.adi@xxxxxxxxx> Signed-off-by: Bryan Wu <cooloney@xxxxxxxxxx> Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/serial/bfin_5xx.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff -puN drivers/serial/bfin_5xx.c~blackfin-serial-driver-use-the-dlab-macro-to-hide-variant-differences drivers/serial/bfin_5xx.c --- a/drivers/serial/bfin_5xx.c~blackfin-serial-driver-use-the-dlab-macro-to-hide-variant-differences +++ a/drivers/serial/bfin_5xx.c @@ -1250,7 +1250,7 @@ struct console __init *bfin_earlyserial_ void bfin_serial_debug(const char *fmt, ...) { struct bfin_serial_port *uart = &bfin_serial_ports[0]; - unsigned short status, tmp; + unsigned short status; unsigned long flags; int i, count; char buf[128]; @@ -1273,11 +1273,7 @@ void bfin_serial_debug(const char *fmt, status = UART_GET_LSR(uart); } while (!(status & THRE)); -#ifndef CONFIG_BF54x - tmp = UART_GET_LCR(uart); - tmp &= ~DLAB; - UART_PUT_LCR(uart, tmp); -#endif + UART_CLEAR_DLAB(uart); UART_PUT_CHAR(uart, buf[i]); if (buf[i] == '\n') { do { _ Patches currently in -mm which might be from vapier.adi@xxxxxxxxx are linux-next.patch blackfin-nfc-driver-do-not-clobber-dmac1_perimux.patch blackfin-nfc-driver-mark-bf5xx_nand_add_partition-as-__devinit.patch blackfin-nfc-driver-drop-pointless-casts-with-set_dma_callback.patch blackfin-serial-driver-explain-why-we-cannot-cpu_relax-in-early-serial-code.patch blackfin-serial-driver-use-unsigned-long-for-flags-with-irq-functions-rather-than-int.patch blackfin-serial-driver-irq-funcs-take-an-unsigned-long-for-flags.patch blackfin-serial-driver-update-kgdb-uart-config-name.patch blackfin-serial-driver-fix-building-when-debug-is-enabled-but-serial-console-is-disabled.patch blackfin-serial-driver-depend-on-kgdb_serial_console-being-set-to-n.patch blackfin-serial-driver-use-the-dlab-macro-to-hide-variant-differences.patch blackfin-serial-driver-update-path-to-gpio-header.patch flat-fix-data-sections-alignment-update.patch blackfin-spi-driver-ensure-cache-coherency-before-doing-dma.patch blackfin-spi-driver-remove-useless-asm-cplbinith.patch blackfin-spi-driver-use-len_in_bytes-when-we-care-about-the-number-of-bytes-transferred.patch blackfin-spi-driver-pass-dma-overflow-error-to-the-higher-level.patch blackfin-spi-driver-unify-duplicated-code-in-dma-read-write-paths.patch blackfin-spi-driver-drop-bogus-cast-and-touchup-dma-label.patch blackfin-spi-driver-add-a-few-more-dma-debug-messages.patch blackfin-spi-driver-do-not-check-for-spi-errors-if-dma-itself-did-not-flag-any.patch blackfin-spi-driver-use-the-properl-bit_ctl_xxx-defines.patch blackfin-spi-driver-spi-slave-select-code-cleanup.patch blackfin-spi-driver-get-dma-working-for-spi-flashes.patch blackfin-spi-driver-add-timeout-while-waiting-for-spif-in-dma-irq-handler.patch blackfin-spi-driver-tweak-magic-spi-dma-sequence-to-get-it-working-on-bf54x.patch blackfin-spi-driver-use-bfin_spi_-prefix-on-all-functions.patch blackfin-spi-driver-fix-null-pointer-crash.patch bin_elf_fdpic-check-the-return-value-of-clear_user.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html