Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42193e3e authored by Oliver Hartkopp's avatar Oliver Hartkopp Committed by Marc Kleine-Budde
Browse files

can: unify identifiers to ensure unique include processing 



Armin pointed me to the fact that the identifier which is used to ensure the
unique include processing in lunux/include/uapi/linux/can.h is CAN_H.
This clashed with his own source as includes from libraries and APIs should
use an underscore '_' at the identifier start.

This patch fixes the protection identifiers in all CAN relavant includes.

Reported-by: default avatarArmin Burchardt <armin@uni-bremen.de>
Signed-off-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent fd115931

include/linux/can/core.h

+3 −3
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ 
 *

 */



#ifndef CAN_CORE_H

#define CAN_CORE_H

#ifndef _CAN_CORE_H

#define _CAN_CORE_H



#include <linux/can.h>

#include <linux/skbuff.h>
@@ -58,4 +58,4 @@ extern void can_rx_unregister(struct net_device *dev, canid_t can_id, 
extern int can_send(struct sk_buff *skb, int loop);

extern int can_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);



#endif /* CAN_CORE_H */
 
#endif /* !_CAN_CORE_H */

include/linux/can/dev.h

+3 −3
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ 
 *

 */



#ifndef CAN_DEV_H

#define CAN_DEV_H

#ifndef _CAN_DEV_H

#define _CAN_DEV_H



#include <linux/can.h>

#include <linux/can/netlink.h>
@@ -132,4 +132,4 @@ struct sk_buff *alloc_canfd_skb(struct net_device *dev, 
struct sk_buff *alloc_can_err_skb(struct net_device *dev,

				  struct can_frame **cf);



#endif /* CAN_DEV_H */
 
#endif /* !_CAN_DEV_H */

include/linux/can/led.h

+3 −3
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ 
 * published by the Free Software Foundation.

 */



#ifndef CAN_LED_H

#define CAN_LED_H

#ifndef _CAN_LED_H

#define _CAN_LED_H



#include <linux/if.h>

#include <linux/leds.h>
@@ -48,4 +48,4 @@ static inline void can_led_notifier_exit(void) 


#endif



#endif
 
#endif /* !_CAN_LED_H */

include/linux/can/platform/cc770.h

+3 −3
Original line number Diff line number Diff line 
#ifndef _CAN_PLATFORM_CC770_H_

#define _CAN_PLATFORM_CC770_H_

#ifndef _CAN_PLATFORM_CC770_H

#define _CAN_PLATFORM_CC770_H



/* CPU Interface Register (0x02) */

#define CPUIF_CEN	0x01	/* Clock Out Enable */
@@ -30,4 +30,4 @@ struct cc770_platform_data { 
	u8 bcr;		/* Bus Configuration Register */

};



#endif	/* !_CAN_PLATFORM_CC770_H_ */
 
#endif	/* !_CAN_PLATFORM_CC770_H */

include/linux/can/platform/mcp251x.h

+3 −3
Original line number Diff line number Diff line 
#ifndef __CAN_PLATFORM_MCP251X_H__

#define __CAN_PLATFORM_MCP251X_H__

#ifndef _CAN_PLATFORM_MCP251X_H

#define _CAN_PLATFORM_MCP251X_H



/*

 *
@@ -18,4 +18,4 @@ struct mcp251x_platform_data { 
	unsigned long oscillator_frequency;

};



#endif /* __CAN_PLATFORM_MCP251X_H__ */
 
#endif /* !_CAN_PLATFORM_MCP251X_H */