From patchwork Tue Apr 13 10:03:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hans J. Koch" X-Patchwork-Id: 50057 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 52F1BB7CF8 for ; Tue, 13 Apr 2010 20:04:04 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752760Ab0DMKDr (ORCPT ); Tue, 13 Apr 2010 06:03:47 -0400 Received: from www.tglx.de ([62.245.132.106]:52133 "EHLO www.tglx.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752082Ab0DMKDp (ORCPT ); Tue, 13 Apr 2010 06:03:45 -0400 Received: from bluebox.tec.linutronix.de (p549AC540.dip.t-dialin.net [84.154.197.64]) (authenticated bits=0) by www.tglx.de (8.13.8/8.13.8/TGLX-2007100201) with ESMTP id o3DA3PJM023501 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Tue, 13 Apr 2010 12:03:26 +0200 Received: from hans by bluebox.tec.linutronix.de with local (Exim 4.71) (envelope-from ) id 1O1cxp-0000pA-6y; Tue, 13 Apr 2010 12:03:25 +0200 Date: Tue, 13 Apr 2010 12:03:25 +0200 From: "Hans J. Koch" To: netdev@vger.kernel.org Cc: socketcan-core@lists.berlios.de, kernel@pengutronix.de, Barry Song <21cnbao@gmail.com>, Chris Elston , Christian Pellegrin , Wolfgang Grandegger , Sebastian Haas , Per Dalen , Pavel Cheblakov , Oliver Hartkopp , Anant Gole Subject: [PATCH - resubmit] Fix some #includes in CAN drivers (rebased for net-next-2.6) Message-ID: <20100413100324.GC2011@bluebox.local> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-Virus-Scanned: clamav-milter 0.95.1 at www.tglx.de X-Virus-Status: Clean X-Spam-Status: No, score=1.6 required=5.0 tests=AWL,RCVD_IN_PBL, RCVD_IN_SORBS_DUL,RDNS_DYNAMIC autolearn=no version=3.2.5 X-Spam-Level: * X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on www.tglx.de Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: 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(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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