svn commit: r273761 - head/sys/dev/uart

[Marcelo Araujo]

Author: araujo (ports committer)
Date: Tue Oct 28 03:42:09 2014
New Revision: 273761
URL: https://svnweb.freebsd.org/changeset/base/273761

Log:
  Drop __DECONST as well as few fixes of style(9).
  
  Phabric:      D1012
  Suggested by: mjg, jhb
  Reviewed by:  mjg, jhb
  Sponsored by: QNAP Systems Inc.

Modified:
  head/sys/dev/uart/uart_subr.c

Modified: head/sys/dev/uart/uart_subr.c
==============================================================================
--- head/sys/dev/uart/uart_subr.c       Tue Oct 28 02:05:57 2014        
(r273760)
+++ head/sys/dev/uart/uart_subr.c       Tue Oct 28 03:42:09 2014        
(r273761)
@@ -196,7 +196,8 @@ out:
 int
 uart_getenv(int devtype, struct uart_devinfo *di, struct uart_class *class)
 {
-       const char *cp, *spec;
+       const char *spec;
+       char *cp;
        bus_addr_t addr = ~0U;
        int error;
 
@@ -213,12 +214,18 @@ uart_getenv(int devtype, struct uart_dev
         * which UART port is to be used as serial console or debug
         * port (resp).
         */
-       if (devtype == UART_DEV_CONSOLE)
+       switch (devtype) {
+       case UART_DEV_CONSOLE:
                cp = kern_getenv("hw.uart.console");
-       else if (devtype == UART_DEV_DBGPORT)
+               break;
+       case UART_DEV_DBGPORT:
                cp = kern_getenv("hw.uart.dbgport");
-       else
+               break;
+       default:
                cp = NULL;
+               break;
+       }
+
        if (cp == NULL)
                return (ENXIO);
 
@@ -233,7 +240,7 @@ uart_getenv(int devtype, struct uart_dev
 
        /* Parse the attributes. */
        spec = cp;
-       while (1) {
+       for (;;) {
                switch (uart_parse_tag(&spec)) {
                case UART_TAG_BR:
                        di->baudrate = uart_parse_long(&spec);
@@ -268,18 +275,18 @@ uart_getenv(int devtype, struct uart_dev
                        di->bas.rclk = uart_parse_long(&spec);
                        break;
                default:
-                       freeenv(__DECONST(char *, cp));
+                       freeenv(cp);
                        return (EINVAL);
                }
                if (*spec == '\0')
                        break;
                if (*spec != ',') {
-                       freeenv(__DECONST(char *, cp));
+                       freeenv(cp);
                        return (EINVAL);
                }
                spec++;
        }
-       freeenv(__DECONST(char *, cp));
+       freeenv(cp);
 
        /*
         * If we still have an invalid address, the specification must be
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"