staging: dgnc: remove double underscore

Pre-processor header guards use double underscore, typically kernel
code uses single underscore when defining header guards. 'endif'
statement should include what is ending as a comment string.

Remove double underscore, add comment string to 'endif'

Signed-off-by: Tobin C. Harding <me@tobin.cc>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/dgnc/dgnc_cls.h b/drivers/staging/dgnc/dgnc_cls.h
index ee01473cecf5a8dc16e96e311edb07a2094dbed7..9dfa9682a8973ef72e5443363b2b354098a911ff 100644 (file)
--- a/drivers/staging/dgnc/dgnc_cls.h
+++ b/drivers/staging/dgnc/dgnc_cls.h
@@ -13,8 +13,8 @@
  * PURPOSE.  See the GNU General Public License for more details.
  */
 
-#ifndef __DGNC_CLS_H
-#define __DGNC_CLS_H
+#ifndef _DGNC_CLS_H
+#define _DGNC_CLS_H
 
 /**
  * struct cls_uart_struct - Per channel/port Classic UART.
@@ -73,4 +73,4 @@ struct cls_uart_struct {
 
 extern struct board_ops dgnc_cls_ops;
 
-#endif
+#endif /* _DGNC_CLS_H */

diff --git a/drivers/staging/dgnc/dgnc_driver.h b/drivers/staging/dgnc/dgnc_driver.h
index 65f3f53714321abc62f6bc7cf6756c64d49c114e..a25801d76095f0fa623eb649234f0489f9a7515e 100644 (file)
--- a/drivers/staging/dgnc/dgnc_driver.h
+++ b/drivers/staging/dgnc/dgnc_driver.h
@@ -13,8 +13,8 @@
  * PURPOSE.  See the GNU General Public License for more details.
  */
 
-#ifndef __DGNC_DRIVER_H
-#define __DGNC_DRIVER_H
+#ifndef _DGNC_DRIVER_H
+#define _DGNC_DRIVER_H
 
 #include <linux/types.h>
 #include <linux/tty.h>
@@ -428,4 +428,4 @@ extern spinlock_t   dgnc_poll_lock;         /* Poll scheduling lock */
 extern uint            dgnc_num_boards;        /* Total number of boards */
 extern struct dgnc_board *dgnc_board[MAXBOARDS];/* Array of boards */
 
-#endif
+#endif /* _DGNC_DRIVER_H */

diff --git a/drivers/staging/dgnc/dgnc_mgmt.h b/drivers/staging/dgnc/dgnc_mgmt.h
index 708abe9594d41a2c91bfe3e6de77117c113a46be..a7a5770d7630e4364a38479c6905e9ee9ba4a66d 100644 (file)
--- a/drivers/staging/dgnc/dgnc_mgmt.h
+++ b/drivers/staging/dgnc/dgnc_mgmt.h
@@ -13,13 +13,14 @@
  * PURPOSE.  See the GNU General Public License for more details.
  */
 
-#ifndef __DGNC_MGMT_H
-#define __DGNC_MGMT_H
+#ifndef _DGNC_MGMT_H
+#define _DGNC_MGMT_H
 
 #define MAXMGMTDEVICES 8
 
 int dgnc_mgmt_open(struct inode *inode, struct file *file);
 int dgnc_mgmt_close(struct inode *inode, struct file *file);
 long dgnc_mgmt_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
-#endif
+
+#endif /* _DGNC_MGMT_H */
 

diff --git a/drivers/staging/dgnc/dgnc_neo.h b/drivers/staging/dgnc/dgnc_neo.h
index 6a6a83e7b7d0537dd08adc353443d1205ba2760b..c30a2c2b5eea95d5bce9951dd9d1ec2bb19dd24f 100644 (file)
--- a/drivers/staging/dgnc/dgnc_neo.h
+++ b/drivers/staging/dgnc/dgnc_neo.h
@@ -13,8 +13,8 @@
  * PURPOSE.  See the GNU General Public License for more details.
  */
 
-#ifndef __DGNC_NEO_H
-#define __DGNC_NEO_H
+#ifndef _DGNC_NEO_H
+#define _DGNC_NEO_H
 
 #include "dgnc_driver.h"
 
@@ -172,4 +172,4 @@ struct neo_uart_struct {
 
 extern struct board_ops dgnc_neo_ops;
 
-#endif
+#endif /* _DGNC_NEO_H */

diff --git a/drivers/staging/dgnc/dgnc_pci.h b/drivers/staging/dgnc/dgnc_pci.h
index 4d6fc4aebb6977960b2ab85a45f6479b7c4ca5eb..59845916d90cc2e9c4c6226fa68a9eaca837523f 100644 (file)
--- a/drivers/staging/dgnc/dgnc_pci.h
+++ b/drivers/staging/dgnc/dgnc_pci.h
@@ -13,8 +13,8 @@
  * PURPOSE.  See the GNU General Public License for more details.
  */
 
-#ifndef __DGNC_PCI_H
-#define __DGNC_PCI_H
+#ifndef _DGNC_PCI_H
+#define _DGNC_PCI_H
 
 /* Maximum number of PCI boards */
 #define PCIMAX 32
@@ -66,4 +66,4 @@
 /* Size of memory (2MB) */
 #define PCI_MEM_SIZE                           0x1000
 
-#endif
+#endif /* _DGNC_PCI_H */

diff --git a/drivers/staging/dgnc/dgnc_tty.h b/drivers/staging/dgnc/dgnc_tty.h
index 1ee0eeeb47308c5a433157a4b7d9637e0fbef06e..6c58f1b3461a99b5fa937c50d21fa157b7c577e0 100644 (file)
--- a/drivers/staging/dgnc/dgnc_tty.h
+++ b/drivers/staging/dgnc/dgnc_tty.h
@@ -13,8 +13,8 @@
  * PURPOSE.  See the GNU General Public License for more details.
  */
 
-#ifndef __DGNC_TTY_H
-#define __DGNC_TTY_H
+#ifndef _DGNC_TTY_H
+#define _DGNC_TTY_H
 
 #include "dgnc_driver.h"
 
@@ -30,4 +30,4 @@ void  dgnc_carrier(struct channel_t *ch);
 void   dgnc_wakeup_writes(struct channel_t *ch);
 void   dgnc_check_queue_flow_control(struct channel_t *ch);
 
-#endif
+#endif /* _DGNC_TTY_H */

diff --git a/drivers/staging/dgnc/dgnc_utils.h b/drivers/staging/dgnc/dgnc_utils.h
index 1164c3a09c6bed0b1e6d34225f5e26410e1a2917..d1f07a5735c678284e0262a61b01ff43374edaf3 100644 (file)
--- a/drivers/staging/dgnc/dgnc_utils.h
+++ b/drivers/staging/dgnc/dgnc_utils.h
@@ -1,6 +1,6 @@
-#ifndef __DGNC_UTILS_H
-#define __DGNC_UTILS_H
+#ifndef _DGNC_UTILS_H
+#define _DGNC_UTILS_H
 
 int dgnc_ms_sleep(ulong ms);
 
-#endif
+#endif /* _DGNC_UTILS_H */

diff --git a/drivers/staging/dgnc/digi.h b/drivers/staging/dgnc/digi.h
index 84a914e7551517d66632bb10a5bc9b0a80ade01c..46b06b07bbf2a026b68b526eb96ca6bafbd88f4f 100644 (file)
--- a/drivers/staging/dgnc/digi.h
+++ b/drivers/staging/dgnc/digi.h
@@ -13,8 +13,8 @@
  * PURPOSE.  See the GNU General Public License for more details.
  */
 
-#ifndef __DIGI_H
-#define __DIGI_H
+#ifndef _DIGI_H
+#define _DIGI_H
 
 #ifndef TIOCM_LE
 #define                TIOCM_LE        0x01            /* line enable */
@@ -210,4 +210,5 @@ struct ni_info {
 #define T_NEO 0000
 
 #define TTY_FLIPBUF_SIZE 512
-#endif /* DIGI_H */
+
+#endif /* _DIGI_H */