From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Hans J. Koch" Subject: [PATCH - resubmit] Fix some #includes in CAN drivers (rebased for net-next-2.6) Date: Tue, 13 Apr 2010 12:03:25 +0200 Message-ID: <20100413100324.GC2011@bluebox.local> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: Chris Elston , Sebastian Haas , socketcan-core-0fE9KPoRgkgATYTw5x5z8w@public.gmane.org, Per Dalen , Oliver Hartkopp , kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org, Wolfgang Grandegger , Christian Pellegrin To: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Return-path: Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: socketcan-core-bounces-0fE9KPoRgkgATYTw5x5z8w@public.gmane.org Errors-To: socketcan-core-bounces-0fE9KPoRgkgATYTw5x5z8w@public.gmane.org List-Id: netdev.vger.kernel.org In the current implementation, CAN drivers need to #include _before_ they #include , which is both ugly and unnecessary. Fix this by including in and remove the #include lines from drivers. Signed-off-by: Hans J. Koch --- drivers/net/can/at91_can.c | 1 - drivers/net/can/bfin_can.c | 1 - drivers/net/can/mcp251x.c | 1 - drivers/net/can/mscan/mpc5xxx_can.c | 1 - drivers/net/can/mscan/mscan.c | 1 - drivers/net/can/sja1000/ems_pci.c | 1 - drivers/net/can/sja1000/kvaser_pci.c | 1 - drivers/net/can/sja1000/plx_pci.c | 1 - drivers/net/can/sja1000/sja1000.c | 1 - drivers/net/can/sja1000/sja1000_isa.c | 1 - drivers/net/can/sja1000/sja1000_of_platform.c | 1 - drivers/net/can/sja1000/sja1000_platform.c | 1 - drivers/net/can/ti_hecc.c | 1 - include/linux/can/dev.h | 1 + 14 files changed, 1 insertion(+), 13 deletions(-) Index: net-next-2.6/include/linux/can/dev.h =================================================================== --- net-next-2.6.orig/include/linux/can/dev.h 2010-04-13 11:27:39.000000000 +0200 +++ net-next-2.6/include/linux/can/dev.h 2010-04-13 11:31:57.000000000 +0200 @@ -14,6 +14,7 @@ #ifndef CAN_DEV_H #define CAN_DEV_H +#include #include #include Index: net-next-2.6/drivers/net/can/at91_can.c =================================================================== --- net-next-2.6.orig/drivers/net/can/at91_can.c 2010-04-13 11:27:33.000000000 +0200 +++ net-next-2.6/drivers/net/can/at91_can.c 2010-04-13 11:31:57.000000000 +0200 @@ -35,7 +35,6 @@ #include #include -#include #include #include Index: net-next-2.6/drivers/net/can/bfin_can.c =================================================================== --- net-next-2.6.orig/drivers/net/can/bfin_can.c 2010-04-13 11:27:33.000000000 +0200 +++ net-next-2.6/drivers/net/can/bfin_can.c 2010-04-13 11:31:57.000000000 +0200 @@ -18,7 +18,6 @@ #include #include -#include #include #include Index: net-next-2.6/drivers/net/can/mcp251x.c =================================================================== --- net-next-2.6.orig/drivers/net/can/mcp251x.c 2010-04-13 11:27:33.000000000 +0200 +++ net-next-2.6/drivers/net/can/mcp251x.c 2010-04-13 11:31:57.000000000 +0200 @@ -58,7 +58,6 @@ * */ -#include #include #include #include Index: net-next-2.6/drivers/net/can/ti_hecc.c =================================================================== --- net-next-2.6.orig/drivers/net/can/ti_hecc.c 2010-04-13 11:27:33.000000000 +0200 +++ net-next-2.6/drivers/net/can/ti_hecc.c 2010-04-13 11:31:57.000000000 +0200 @@ -47,7 +47,6 @@ #include #include -#include #include #include #include Index: net-next-2.6/drivers/net/can/mscan/mpc5xxx_can.c =================================================================== --- net-next-2.6.orig/drivers/net/can/mscan/mpc5xxx_can.c 2010-04-13 11:27:33.000000000 +0200 +++ net-next-2.6/drivers/net/can/mscan/mpc5xxx_can.c 2010-04-13 11:31:57.000000000 +0200 @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include Index: net-next-2.6/drivers/net/can/mscan/mscan.c =================================================================== --- net-next-2.6.orig/drivers/net/can/mscan/mscan.c 2010-04-13 11:27:33.000000000 +0200 +++ net-next-2.6/drivers/net/can/mscan/mscan.c 2010-04-13 11:31:57.000000000 +0200 @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include Index: net-next-2.6/drivers/net/can/sja1000/ems_pci.c =================================================================== --- net-next-2.6.orig/drivers/net/can/sja1000/ems_pci.c 2010-04-13 11:27:33.000000000 +0200 +++ net-next-2.6/drivers/net/can/sja1000/ems_pci.c 2010-04-13 11:31:57.000000000 +0200 @@ -24,7 +24,6 @@ #include #include #include -#include #include #include Index: net-next-2.6/drivers/net/can/sja1000/kvaser_pci.c =================================================================== --- net-next-2.6.orig/drivers/net/can/sja1000/kvaser_pci.c 2010-04-13 11:27:33.000000000 +0200 +++ net-next-2.6/drivers/net/can/sja1000/kvaser_pci.c 2010-04-13 11:31:57.000000000 +0200 @@ -36,7 +36,6 @@ #include #include #include -#include #include #include Index: net-next-2.6/drivers/net/can/sja1000/plx_pci.c =================================================================== --- net-next-2.6.orig/drivers/net/can/sja1000/plx_pci.c 2010-04-13 11:27:33.000000000 +0200 +++ net-next-2.6/drivers/net/can/sja1000/plx_pci.c 2010-04-13 11:31:57.000000000 +0200 @@ -27,7 +27,6 @@ #include #include #include -#include #include #include Index: net-next-2.6/drivers/net/can/sja1000/sja1000.c =================================================================== --- net-next-2.6.orig/drivers/net/can/sja1000/sja1000.c 2010-04-13 11:27:33.000000000 +0200 +++ net-next-2.6/drivers/net/can/sja1000/sja1000.c 2010-04-13 11:31:57.000000000 +0200 @@ -60,7 +60,6 @@ #include #include -#include #include #include Index: net-next-2.6/drivers/net/can/sja1000/sja1000_isa.c =================================================================== --- net-next-2.6.orig/drivers/net/can/sja1000/sja1000_isa.c 2010-04-13 11:27:33.000000000 +0200 +++ net-next-2.6/drivers/net/can/sja1000/sja1000_isa.c 2010-04-13 11:31:57.000000000 +0200 @@ -23,7 +23,6 @@ #include #include #include -#include #include #include Index: net-next-2.6/drivers/net/can/sja1000/sja1000_of_platform.c =================================================================== --- net-next-2.6.orig/drivers/net/can/sja1000/sja1000_of_platform.c 2010-04-13 11:27:33.000000000 +0200 +++ net-next-2.6/drivers/net/can/sja1000/sja1000_of_platform.c 2010-04-13 11:31:57.000000000 +0200 @@ -38,7 +38,6 @@ #include #include #include -#include #include #include Index: net-next-2.6/drivers/net/can/sja1000/sja1000_platform.c =================================================================== --- net-next-2.6.orig/drivers/net/can/sja1000/sja1000_platform.c 2010-04-13 11:27:33.000000000 +0200 +++ net-next-2.6/drivers/net/can/sja1000/sja1000_platform.c 2010-04-13 11:31:57.000000000 +0200 @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include