Commit bbd500d8cdb071e7964fc07ab988817d719e1578

Authored by Ben Chan
Committed by Greg Kroah-Hartman
1 parent 6de2a1a7b9

staging: gdm72xx: use consistent style for header guards

Signed-off-by: Ben Chan <benchan@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 10 changed files with 32 additions and 30 deletions Side-by-side Diff

drivers/staging/gdm72xx/gdm_qos.h
... ... @@ -11,8 +11,8 @@
11 11 * GNU General Public License for more details.
12 12 */
13 13  
14   -#if !defined(GDM_QOS_H_20090403)
15   -#define GDM_QOS_H_20090403
  14 +#ifndef __GDM72XX_GDM_QOS_H__
  15 +#define __GDM72XX_GDM_QOS_H__
16 16  
17 17 #include <linux/types.h>
18 18 #include <linux/usb.h>
... ... @@ -71,5 +71,5 @@
71 71 int gdm_qos_send_hci_pkt(struct sk_buff *skb, struct net_device *dev);
72 72 void gdm_recv_qos_hci_packet(void *nic_ptr, u8 *buf, int size);
73 73  
74   -#endif
  74 +#endif /* __GDM72XX_GDM_QOS_H__ */
drivers/staging/gdm72xx/gdm_sdio.h
... ... @@ -11,8 +11,8 @@
11 11 * GNU General Public License for more details.
12 12 */
13 13  
14   -#ifndef __GDM_SDIO_H__
15   -#define __GDM_SDIO_H__
  14 +#ifndef __GDM72XX_GDM_SDIO_H__
  15 +#define __GDM72XX_GDM_SDIO_H__
16 16  
17 17 #include <linux/types.h>
18 18 #include <linux/time.h>
... ... @@ -60,5 +60,5 @@
60 60 struct work_struct ws;
61 61 };
62 62  
63   -#endif /* __GDM_SDIO_H__ */
  63 +#endif /* __GDM72XX_GDM_SDIO_H__ */
drivers/staging/gdm72xx/gdm_usb.h
... ... @@ -11,8 +11,8 @@
11 11 * GNU General Public License for more details.
12 12 */
13 13  
14   -#ifndef __GDM_USB_H__
15   -#define __GDM_USB_H__
  14 +#ifndef __GDM72XX_GDM_USB_H__
  15 +#define __GDM72XX_GDM_USB_H__
16 16  
17 17 #include <linux/types.h>
18 18 #include <linux/usb.h>
... ... @@ -75,5 +75,5 @@
75 75 int padding;
76 76 };
77 77  
78   -#endif /* __GDM_USB_H__ */
  78 +#endif /* __GDM72XX_GDM_USB_H__ */
drivers/staging/gdm72xx/gdm_wimax.h
... ... @@ -11,8 +11,8 @@
11 11 * GNU General Public License for more details.
12 12 */
13 13  
14   -#ifndef __GDM_WIMAX_H__
15   -#define __GDM_WIMAX_H__
  14 +#ifndef __GDM72XX_GDM_WIMAX_H__
  15 +#define __GDM72XX_GDM_WIMAX_H__
16 16  
17 17 #include <linux/netdevice.h>
18 18 #include <linux/types.h>
... ... @@ -57,5 +57,5 @@
57 57 int gdm_wimax_send_tx(struct sk_buff *skb, struct net_device *dev);
58 58 void unregister_wimax_device(struct phy_dev *phy_dev);
59 59  
60   -#endif
  60 +#endif /* __GDM72XX_GDM_WIMAX_H__ */
drivers/staging/gdm72xx/hci.h
... ... @@ -11,8 +11,8 @@
11 11 * GNU General Public License for more details.
12 12 */
13 13  
14   -#ifndef HCI_H_20080801
15   -#define HCI_H_20080801
  14 +#ifndef __GDM72XX_HCI_H__
  15 +#define __GDM72XX_HCI_H__
16 16  
17 17 #define HCI_HEADER_SIZE 4
18 18 #define HCI_VALUE_OFFS (HCI_HEADER_SIZE)
... ... @@ -204,5 +204,5 @@
204 204 unsigned char data[0];
205 205 } __packed;
206 206  
207   -#endif
  207 +#endif /* __GDM72XX_HCI_H__ */
drivers/staging/gdm72xx/netlink_k.h
... ... @@ -11,8 +11,9 @@
11 11 * GNU General Public License for more details.
12 12 */
13 13  
14   -#if !defined(NETLINK_H_20081202)
15   -#define NETLINK_H_20081202
  14 +#ifndef __GDM72XX_NETLINK_K_H__
  15 +#define __GDM72XX_NETLINK_K_H__
  16 +
16 17 #include <linux/netdevice.h>
17 18 #include <net/sock.h>
18 19  
... ... @@ -21,5 +22,5 @@
21 22 void netlink_exit(struct sock *sock);
22 23 int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len);
23 24  
24   -#endif
  25 +#endif /* __GDM72XX_NETLINK_K_H__ */
drivers/staging/gdm72xx/sdio_boot.h
... ... @@ -11,12 +11,12 @@
11 11 * GNU General Public License for more details.
12 12 */
13 13  
14   -#ifndef __SDIO_BOOT_H__
15   -#define __SDIO_BOOT_H__
  14 +#ifndef __GDM72XX_SDIO_BOOT_H__
  15 +#define __GDM72XX_SDIO_BOOT_H__
16 16  
17 17 struct sdio_func;
18 18  
19 19 int sdio_boot(struct sdio_func *func);
20 20  
21   -#endif /* __SDIO_BOOT_H__ */
  21 +#endif /* __GDM72XX_SDIO_BOOT_H__ */
drivers/staging/gdm72xx/usb_boot.h
... ... @@ -11,13 +11,13 @@
11 11 * GNU General Public License for more details.
12 12 */
13 13  
14   -#ifndef __USB_BOOT_H__
15   -#define __USB_BOOT_H__
  14 +#ifndef __GDM72XX_USB_BOOT_H__
  15 +#define __GDM72XX_USB_BOOT_H__
16 16  
17 17 struct usb_device;
18 18  
19 19 int usb_boot(struct usb_device *usbdev, u16 pid);
20 20 int usb_emergency(struct usb_device *usbdev);
21 21  
22   -#endif /* __USB_BOOT_H__ */
  22 +#endif /* __GDM72XX_USB_BOOT_H__ */
drivers/staging/gdm72xx/usb_ids.h
... ... @@ -11,8 +11,8 @@
11 11 * GNU General Public License for more details.
12 12 */
13 13  
14   -#ifndef __USB_IDS_H__
15   -#define __USB_IDS_H__
  14 +#ifndef __GDM72XX_USB_IDS_H__
  15 +#define __GDM72XX_USB_IDS_H__
16 16  
17 17 /*You can replace vendor-ID as yours.*/
18 18 #define GCT_VID 0x1076
... ... @@ -79,5 +79,5 @@
79 79 { }
80 80 };
81 81  
82   -#endif /* __USB_IDS_H__ */
  82 +#endif /* __GDM72XX_USB_IDS_H__ */
drivers/staging/gdm72xx/wm_ioctl.h
... ... @@ -11,8 +11,9 @@
11 11 * GNU General Public License for more details.
12 12 */
13 13  
14   -#if !defined(WM_IOCTL_H_20080714)
15   -#define WM_IOCTL_H_20080714
  14 +#ifndef __GDM72XX_WM_IOCTL_H__
  15 +#define __GDM72XX_WM_IOCTL_H__
  16 +
16 17 #if !defined(__KERNEL__)
17 18 #include <net/if.h>
18 19 #endif
... ... @@ -92,5 +93,5 @@
92 93 #define ifr_name ifr_ifrn.ifrn_name
93 94 #endif
94 95  
95   -#endif
  96 +#endif /* __GDM72XX_WM_IOCTL_H__ */