Style: Fix big comments

[elmcan.git] / module / elmcan.c

diff --git a/module/elmcan.c b/module/elmcan.c
index ef6fc6db3106c929b2343196dfe9654d8e8b3c51..ba4ef0d710ca00bf2d59b0b666837b8d3446e69f 100644 (file)
--- a/module/elmcan.c
+++ b/module/elmcan.c
@@ -156,11 +156,11 @@ static inline void elm327_hw_failure(struct elmcan *elm);
 
 
 
- /************************************************************************
-  *            ELM327: Transmission                            *
-  *                                                            *
-  * (all functions assume elm->lock taken)                     *
-  ************************************************************************/
+ /***********************************************************************
+  *            ELM327: Transmission                                    *
+  *                                                                    *
+  * (all functions assume elm->lock taken)                             *
+  ***********************************************************************/
 
 static void elm327_send(struct elmcan *elm, const void *buf, size_t len)
 {
@@ -247,11 +247,11 @@ static void elm327_send_frame(struct elmcan *elm, struct can_frame *frame)
 
 
 
- /************************************************************************
-  *            ELM327: Initialization sequence                 *
-  *                                                            *
-  * (assumes elm->lock taken)                                  *
-  ************************************************************************/
+ /***********************************************************************
+  *            ELM327: Initialization sequence                         *
+  *                                                                    *
+  * (assumes elm->lock taken)                                          *
+  ***********************************************************************/
 
 static char *elm327_init_script[] = {
        "AT WS\r",        /* v1.0: Warm Start */
@@ -305,11 +305,11 @@ static void elm327_init(struct elmcan *elm)
 
 
 
- /************************************************************************
-  *            ELM327: Reception -> netdev glue                *
-  *                                                            *
-  * (assumes elm->lock taken)                                  *
-  ************************************************************************/
+ /***********************************************************************
+  *            ELM327: Reception -> netdev glue                        *
+  *                                                                    *
+  * (assumes elm->lock taken)                                          *
+  ***********************************************************************/
 
 static void elm327_feed_frame_to_netdev(struct elmcan *elm,
                                        const struct can_frame *frame)
@@ -336,11 +336,11 @@ static void elm327_feed_frame_to_netdev(struct elmcan *elm,
 
 
 
- /************************************************************************
-  *            ELM327: "Panic" handler                         *
-  *                                                            *
-  * (assumes elm->lock taken)                                  *
-  ************************************************************************/
+ /***********************************************************************
+  *            ELM327: "Panic" handler                                 *
+  *                                                                    *
+  * (assumes elm->lock taken)                                          *
+  ***********************************************************************/
 
 /* Called when we're out of ideas and just want it all to end. */
 static inline void elm327_hw_failure(struct elmcan *elm)
@@ -781,11 +781,11 @@ static void elm327_parse_rxbuf(struct elmcan *elm)
 
 
 
- /************************************************************************
-  *            netdev                                          *
-  *                                                            *
-  * (takes elm->lock)                                          *
-  ************************************************************************/
+ /***********************************************************************
+  *            netdev                                                  *
+  *                                                                    *
+  * (takes elm->lock)                                                  *
+  ***********************************************************************/
 
 static int elmcan_netdev_open(struct net_device *dev)
 {
@@ -909,11 +909,11 @@ static const struct net_device_ops elmcan_netdev_ops = {
 
 
 
- /************************************************************************
-  *            Line discipline                                 *
-  *                                                            *
-  * (takes elm->lock)                                          *
-  ************************************************************************/
+ /***********************************************************************
+  *            Line discipline                                         *
+  *                                                                    *
+  * (takes elm->lock)                                                  *
+  ***********************************************************************/
 
 /* Get a reference to our struct, taking into account locks/refcounts.
  * This is to ensure ordering in case we are shutting down, and to ensure
@@ -949,6 +949,23 @@ static void put_elm(struct elmcan *elm)
 }
 
 
+static bool elmcan_is_valid_rx_char(char c)
+{
+       return (accept_flaky_uart
+               || isdigit(c)
+               || isupper(c)
+               || ELM327_MAGIC_CHAR == c
+               || ELM327_READY_CHAR == c
+               || '<' == c
+               || 'a' == c
+               || 'b' == c
+               || 'v' == c
+               || '.' == c
+               || '?' == c
+               || '\r' == c
+               || ' ' == c);
+}
+
 /* Handle incoming ELM327 ASCII data.
  * This will not be re-entered while running, but other ldisc
  * functions may be called in parallel.
@@ -985,19 +1002,7 @@ static void elmcan_ldisc_rx(struct tty_struct *tty,
                        /* Check for stray characters on the UART line.
                         * Likely caused by bad hardware.
                         */
-                       if (!accept_flaky_uart
-                           && !isdigit(*cp)
-                           && !isupper(*cp)
-                           && ELM327_MAGIC_CHAR != *cp
-                           && ELM327_READY_CHAR != *cp
-                           && '<' != *cp
-                           && 'a' != *cp
-                           && 'b' != *cp
-                           && 'v' != *cp
-                           && '.' != *cp
-                           && '?' != *cp
-                           && '\r' != *cp
-                           && ' ' != *cp) {
+                       if (!elmcan_is_valid_rx_char(*cp)) {
                                netdev_err(elm->dev,
                                           "Received illegal character %02x.\n",
                                           *cp);
@@ -1108,6 +1113,8 @@ static const u32 elmcan_bitrate_const[64] = {
 /* Dummy needed to use bitrate_const */
 static int elmcan_do_set_bittiming(struct net_device *netdev)
 {
+       (void)netdev;
+
        return 0;
 }