From 2539fc0c7c7b0dcb076a4bceafff4fb64091b2c2 Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Tue, 28 Mar 2017 10:28:36 +1100 Subject: 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/dgnc/dgnc_cls.h | 6 +++--- drivers/staging/dgnc/dgnc_driver.h | 6 +++--- drivers/staging/dgnc/dgnc_mgmt.h | 7 ++++--- drivers/staging/dgnc/dgnc_neo.h | 6 +++--- drivers/staging/dgnc/dgnc_pci.h | 6 +++--- drivers/staging/dgnc/dgnc_tty.h | 6 +++--- drivers/staging/dgnc/dgnc_utils.h | 6 +++--- drivers/staging/dgnc/digi.h | 7 ++++--- 8 files changed, 26 insertions(+), 24 deletions(-) (limited to 'drivers/staging/dgnc') diff --git a/drivers/staging/dgnc/dgnc_cls.h b/drivers/staging/dgnc/dgnc_cls.h index ee01473cecf5..9dfa9682a897 100644 --- 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 65f3f5371432..a25801d76095 100644 --- 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 #include @@ -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 708abe9594d4..a7a5770d7630 100644 --- 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 6a6a83e7b7d0..c30a2c2b5eea 100644 --- 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 4d6fc4aebb69..59845916d90c 100644 --- 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 1ee0eeeb4730..6c58f1b3461a 100644 --- 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 1164c3a09c6b..d1f07a5735c6 100644 --- 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 84a914e75515..46b06b07bbf2 100644 --- 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 */ -- cgit v1.2.3