Commit dda43a0e authored by Robert P. J. Day's avatar Robert P. J. Day Committed by Greg Kroah-Hartman
Browse files

USB: Standardize inclusion protection and add where missing. 



For the header files in include/linux/usb, add missing multiple
inclusion protection and standardize what's already there.  The
apparent standards:

  * macro name of __LINUX_USB_headerfile_H
  * inclusion protection placed after leading comment block
  * macro name added as a comment on the final #endif
  * any obvious trivial whitespace cleanup associated with the above

Signed-off-by: default avatarRobert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f66396b5

include/linux/usb/audio.h

+1 −1
Original line number Diff line number Diff line
@@ -50,4 +50,4 @@ struct usb_ac_header_descriptor_##n { \ 
	__u8  baInterfaceNr[n];					\

} __attribute__ ((packed))



#endif
 
#endif /* __LINUX_USB_AUDIO_H */

include/linux/usb/cdc.h

+4 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ 
 * firmware based USB peripherals.

 */



#ifndef __LINUX_USB_CDC_H

#define __LINUX_USB_CDC_H



#define USB_CDC_SUBCLASS_ACM			0x02

#define USB_CDC_SUBCLASS_ETHERNET		0x06

#define USB_CDC_SUBCLASS_WHCM			0x08
@@ -221,3 +224,4 @@ struct usb_cdc_notification { 
	__le16	wLength;

} __attribute__ ((packed));



#endif /* __LINUX_USB_CDC_H */

include/linux/usb/g_printer.h

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */



#ifndef __LINUX_USB_G_PRINTER_H

#define __LINUX_USB_G_PRINTER_H



#define PRINTER_NOT_ERROR	0x08

#define PRINTER_SELECTED	0x10
@@ -29,3 +31,5 @@ 
 */

#define GADGET_GET_PRINTER_STATUS	_IOR('g', 0x21, unsigned char)

#define GADGET_SET_PRINTER_STATUS	_IOWR('g', 0x22, unsigned char)



#endif /* __LINUX_USB_G_PRINTER_H */

include/linux/usb/gadgetfs.h

+8 −8
Original line number Diff line number Diff line 
#ifndef __LINUX_USB_GADGETFS_H

#define __LINUX_USB_GADGETFS_H



#include <asm/types.h>

#include <asm/ioctl.h>



#include <linux/usb/ch9.h>



/*

 * Filesystem based user-mode API to USB Gadget controller hardware

 *
@@ -23,6 +15,14 @@ 
 * then performing data transfers by reading or writing.

 */



#ifndef __LINUX_USB_GADGETFS_H

#define __LINUX_USB_GADGETFS_H



#include <asm/types.h>

#include <asm/ioctl.h>



#include <linux/usb/ch9.h>



/*

 * Events are delivered on the ep0 file descriptor, when the user mode driver

 * reads from this file descriptor after writing the descriptors.  Don't

include/linux/usb/input.h

+4 −4
Original line number Diff line number Diff line 
#ifndef __USB_INPUT_H

#define __USB_INPUT_H



/*

 * Copyright (C) 2005 Dmitry Torokhov

 *
@@ -9,6 +6,9 @@ 
 * the Free Software Foundation.

 */



#ifndef __LINUX_USB_INPUT_H

#define __LINUX_USB_INPUT_H



#include <linux/usb.h>

#include <linux/input.h>

#include <asm/byteorder.h>
@@ -22,4 +22,4 @@ usb_to_input_id(const struct usb_device *dev, struct input_id *id) 
	id->version = le16_to_cpu(dev->descriptor.bcdDevice);

}



#endif
 
#endif /* __LINUX_USB_INPUT_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE