From owner-svn-src-head@freebsd.org Tue Sep 1 21:50:03 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6E9B837C1B5; Tue, 1 Sep 2020 21:50:03 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh12M0nvTz4Tph; Tue, 1 Sep 2020 21:50:03 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EABD82015E; Tue, 1 Sep 2020 21:50:02 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081Lo23E040786; Tue, 1 Sep 2020 21:50:02 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Lo093040776; Tue, 1 Sep 2020 21:50:00 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012150.081Lo093040776@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:50:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365142 - head/sys/dev/uart X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/uart X-SVN-Commit-Revision: 365142 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:50:03 -0000 Author: mjg Date: Tue Sep 1 21:50:00 2020 New Revision: 365142 URL: https://svnweb.freebsd.org/changeset/base/365142 Log: uart: clean up empty lines in .c and .h files Modified: head/sys/dev/uart/uart_bus_acpi.c head/sys/dev/uart/uart_bus_pccard.c head/sys/dev/uart/uart_cpu_powerpc.c head/sys/dev/uart/uart_dev_imx.h head/sys/dev/uart/uart_dev_mu.c head/sys/dev/uart/uart_dev_mvebu.c head/sys/dev/uart/uart_dev_ns8250.c head/sys/dev/uart/uart_dev_ns8250.h head/sys/dev/uart/uart_dev_pl011.c head/sys/dev/uart/uart_dev_quicc.c Modified: head/sys/dev/uart/uart_bus_acpi.c ============================================================================== --- head/sys/dev/uart/uart_bus_acpi.c Tue Sep 1 21:49:49 2020 (r365141) +++ head/sys/dev/uart/uart_bus_acpi.c Tue Sep 1 21:50:00 2020 (r365142) @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); #include #include - static int uart_acpi_probe(device_t dev); static device_method_t uart_acpi_methods[] = { Modified: head/sys/dev/uart/uart_bus_pccard.c ============================================================================== --- head/sys/dev/uart/uart_bus_pccard.c Tue Sep 1 21:49:49 2020 (r365141) +++ head/sys/dev/uart/uart_bus_pccard.c Tue Sep 1 21:50:00 2020 (r365142) @@ -53,7 +53,6 @@ static device_method_t uart_pccard_methods[] = { DEVMETHOD(device_probe, uart_pccard_probe), DEVMETHOD(device_attach, uart_pccard_attach), DEVMETHOD(device_detach, uart_bus_detach), - { 0, 0 } }; Modified: head/sys/dev/uart/uart_cpu_powerpc.c ============================================================================== --- head/sys/dev/uart/uart_cpu_powerpc.c Tue Sep 1 21:49:49 2020 (r365141) +++ head/sys/dev/uart/uart_cpu_powerpc.c Tue Sep 1 21:50:00 2020 (r365142) @@ -99,7 +99,7 @@ ofw_get_console_phandle_path(phandle_t node, phandle_t output = OF_finddevice(field.buf); if (output == -1 && size == 4) output = OF_instance_to_package(field.ref); - + if (output != -1) { *result = output; return (0); @@ -202,4 +202,3 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di) di->parity = UART_PARITY_NONE; return (0); } - Modified: head/sys/dev/uart/uart_dev_imx.h ============================================================================== --- head/sys/dev/uart/uart_dev_imx.h Tue Sep 1 21:49:49 2020 (r365141) +++ head/sys/dev/uart/uart_dev_imx.h Tue Sep 1 21:50:00 2020 (r365142) @@ -217,5 +217,4 @@ #define DIS(_bas, _r, _b) CLR((_bas), REG(_r), FLD(_r, _b)) #define IS(_bas, _r, _b) IS_SET((_bas), REG(_r), FLD(_r, _b)) - #endif /* _UART_DEV_IMX5XX_H */ Modified: head/sys/dev/uart/uart_dev_mu.c ============================================================================== --- head/sys/dev/uart/uart_dev_mu.c Tue Sep 1 21:49:49 2020 (r365141) +++ head/sys/dev/uart/uart_dev_mu.c Tue Sep 1 21:50:00 2020 (r365142) @@ -101,7 +101,7 @@ __FBSDID("$FreeBSD$"); #define AUX_MU_MCR_REG 0x04 #define AUX_MCR_RTS (1<<1) - + #define AUX_MU_LSR_REG 0x05 #define LSR_RXREADY (1) #define LSR_OVRRUN (1<<1) @@ -153,7 +153,7 @@ static struct uart_ops uart_mu_ops = { static int uart_mu_probe(struct uart_bas *bas) { - + return (0); } @@ -169,7 +169,7 @@ uart_mu_param(struct uart_bas *bas, int baudrate, int { uint32_t line; uint32_t baud; - + /* * Zero all settings to make sure * UART is disabled and not configured @@ -199,7 +199,7 @@ uart_mu_param(struct uart_bas *bas, int baudrate, int */ __uart_setreg(bas, AUX_MU_BAUD_REG, ((uint32_t)(baud & 0xFFFF))); } - + /* re-enable UART */ __uart_setreg(bas, AUX_MU_CNTL_REG, CNTL_RXENAB|CNTL_TXENAB); } @@ -283,7 +283,6 @@ static kobj_method_t uart_mu_methods[] = { KOBJMETHOD(uart_transmit, uart_mu_bus_transmit), KOBJMETHOD(uart_grab, uart_mu_bus_grab), KOBJMETHOD(uart_ungrab, uart_mu_bus_ungrab), - { 0, 0 } }; @@ -319,7 +318,7 @@ uart_mu_bus_attach(struct uart_softc *sc) psc->aux_ier = (IER_RXENABLE|IER_TXENABLE|IER_REQUIRED); __uart_setreg(bas, AUX_MU_IER_REG, psc->aux_ier); sc->sc_txbusy = 0; - + return (0); } @@ -375,7 +374,7 @@ uart_mu_bus_ipend(struct uart_softc *sc) struct uart_bas *bas; uint32_t ints; int ipend; - + psc = (struct uart_mu_softc *)sc; bas = &sc->sc_bas; @@ -436,11 +435,11 @@ uart_mu_bus_receive(struct uart_softc *sc) struct uart_bas *bas; uint32_t lsr, xc; int rx; - + bas = &sc->sc_bas; uart_lock(sc->sc_hwmtx); psc = (struct uart_mu_softc *)sc; - + lsr = __uart_getreg(bas, AUX_MU_LSR_REG); while (lsr & LSR_RXREADY) { xc = __uart_getreg(bas, AUX_MU_IO_REG); @@ -470,7 +469,7 @@ uart_mu_bus_transmit(struct uart_softc *sc) struct uart_mu_softc *psc; struct uart_bas *bas; int i; - + psc = (struct uart_mu_softc *)sc; bas = &sc->sc_bas; uart_lock(sc->sc_hwmtx); Modified: head/sys/dev/uart/uart_dev_mvebu.c ============================================================================== --- head/sys/dev/uart/uart_dev_mvebu.c Tue Sep 1 21:49:49 2020 (r365141) +++ head/sys/dev/uart/uart_dev_mvebu.c Tue Sep 1 21:50:00 2020 (r365142) @@ -614,4 +614,3 @@ uart_mvebu_bus_ungrab(struct uart_softc *sc) uart_barrier(bas); uart_unlock(sc->sc_hwmtx); } - Modified: head/sys/dev/uart/uart_dev_ns8250.c ============================================================================== --- head/sys/dev/uart/uart_dev_ns8250.c Tue Sep 1 21:49:49 2020 (r365141) +++ head/sys/dev/uart/uart_dev_ns8250.c Tue Sep 1 21:50:00 2020 (r365142) @@ -514,19 +514,19 @@ ns8250_bus_attach(struct uart_softc *sc) ns8250->fcr |= FCR_RX_MEDH; } else ns8250->fcr |= FCR_RX_MEDH; - + /* Get IER mask */ ivar = 0xf0; resource_int_value("uart", device_get_unit(sc->sc_dev), "ier_mask", &ivar); ns8250->ier_mask = (uint8_t)(ivar & 0xff); - + /* Get IER RX interrupt bits */ ivar = IER_EMSC | IER_ERLS | IER_ERXRDY; resource_int_value("uart", device_get_unit(sc->sc_dev), "ier_rxbits", &ivar); ns8250->ier_rxbits = (uint8_t)(ivar & 0xff); - + uart_setreg(bas, REG_FCR, ns8250->fcr); uart_barrier(bas); ns8250_bus_flush(sc, UART_FLUSH_RECEIVER|UART_FLUSH_TRANSMITTER); Modified: head/sys/dev/uart/uart_dev_ns8250.h ============================================================================== --- head/sys/dev/uart/uart_dev_ns8250.h Tue Sep 1 21:49:49 2020 (r365141) +++ head/sys/dev/uart/uart_dev_ns8250.h Tue Sep 1 21:50:00 2020 (r365142) @@ -39,7 +39,7 @@ struct ns8250_softc { uint8_t fcr; uint8_t ier; uint8_t mcr; - + uint8_t ier_mask; uint8_t ier_rxbits; uint8_t busy_detect; Modified: head/sys/dev/uart/uart_dev_pl011.c ============================================================================== --- head/sys/dev/uart/uart_dev_pl011.c Tue Sep 1 21:49:49 2020 (r365141) +++ head/sys/dev/uart/uart_dev_pl011.c Tue Sep 1 21:50:00 2020 (r365142) @@ -317,7 +317,6 @@ static kobj_method_t uart_pl011_methods[] = { KOBJMETHOD(uart_transmit, uart_pl011_bus_transmit), KOBJMETHOD(uart_grab, uart_pl011_bus_grab), KOBJMETHOD(uart_ungrab, uart_pl011_bus_ungrab), - { 0, 0 } }; @@ -330,7 +329,6 @@ static struct uart_class uart_pl011_class = { .uc_rclk = 0, .uc_rshift = 2 }; - #ifdef FDT static struct ofw_compat_data fdt_compat_data[] = { Modified: head/sys/dev/uart/uart_dev_quicc.c ============================================================================== --- head/sys/dev/uart/uart_dev_quicc.c Tue Sep 1 21:49:49 2020 (r365141) +++ head/sys/dev/uart/uart_dev_quicc.c Tue Sep 1 21:50:00 2020 (r365142) @@ -522,4 +522,3 @@ quicc_bus_ungrab(struct uart_softc *sc) quicc_write2(bas, rb, st | 0x9000); uart_unlock(sc->sc_hwmtx); } -