From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755259AbbLFDyF (ORCPT ); Sat, 5 Dec 2015 22:54:05 -0500 Received: from kvm5.telegraphics.com.au ([98.124.60.144]:53125 "EHLO kvm5.telegraphics.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754364AbbLFDoL (ORCPT ); Sat, 5 Dec 2015 22:44:11 -0500 Message-Id: <20151206013138.155513733@telegraphics.com.au> User-Agent: quilt/0.50-1 Date: Sun, 06 Dec 2015 12:32:11 +1100 From: Finn Thain To: "James E.J. Bottomley" , Michael Schmitz , , , , Russell King , linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 45/72] ncr5380: Cleanup #include directives References: <20151206013126.995379403@telegraphics.com.au> Content-Disposition: inline; filename=ncr5380-move-core-driver-includes Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove unused includes (stat.h, signal.h, proc_fs.h) and move includes needed by the core drivers into the common header (delay.h etc). Signed-off-by: Finn Thain --- drivers/scsi/NCR5380.c | 2 -- drivers/scsi/NCR5380.h | 4 ++++ drivers/scsi/arm/cumana_1.c | 4 ---- drivers/scsi/arm/oak.c | 2 -- drivers/scsi/atari_NCR5380.c | 5 ----- drivers/scsi/atari_scsi.c | 1 - drivers/scsi/dmx3191d.c | 5 ----- drivers/scsi/dtc.c | 4 +--- drivers/scsi/g_NCR5380.c | 6 ++---- drivers/scsi/mac_scsi.c | 1 - drivers/scsi/pas16.c | 4 ---- drivers/scsi/t128.c | 3 --- 12 files changed, 7 insertions(+), 34 deletions(-) Index: linux/drivers/scsi/NCR5380.c =================================================================== --- linux.orig/drivers/scsi/NCR5380.c 2015-12-06 12:30:38.000000000 +1100 +++ linux/drivers/scsi/NCR5380.c 2015-12-06 12:30:39.000000000 +1100 @@ -79,8 +79,6 @@ * 4. Test SCSI-II tagged queueing (I have no devices which support * tagged queueing) */ -#include -#include #if (NDEBUG & NDEBUG_LISTS) #define LIST(x,y) {printk("LINE:%d Adding %p to %p\n", __LINE__, (void*)(x), (void*)(y)); if ((x)==(y)) udelay(5); } Index: linux/drivers/scsi/NCR5380.h =================================================================== --- linux.orig/drivers/scsi/NCR5380.h 2015-12-06 12:30:34.000000000 +1100 +++ linux/drivers/scsi/NCR5380.h 2015-12-06 12:30:39.000000000 +1100 @@ -22,8 +22,12 @@ #ifndef NCR5380_H #define NCR5380_H +#include #include +#include +#include #include +#include #define NDEBUG_ARBITRATION 0x1 #define NDEBUG_AUTOSENSE 0x2 Index: linux/drivers/scsi/arm/cumana_1.c =================================================================== --- linux.orig/drivers/scsi/arm/cumana_1.c 2015-12-06 12:30:02.000000000 +1100 +++ linux/drivers/scsi/arm/cumana_1.c 2015-12-06 12:30:39.000000000 +1100 @@ -4,9 +4,7 @@ * Copyright 1995-2002, Russell King */ #include -#include #include -#include #include #include @@ -15,8 +13,6 @@ #include -#include - #define PSEUDO_DMA #define priv(host) ((struct NCR5380_hostdata *)(host)->hostdata) Index: linux/drivers/scsi/arm/oak.c =================================================================== --- linux.orig/drivers/scsi/arm/oak.c 2015-12-06 12:30:02.000000000 +1100 +++ linux/drivers/scsi/arm/oak.c 2015-12-06 12:30:39.000000000 +1100 @@ -5,9 +5,7 @@ */ #include -#include #include -#include #include #include Index: linux/drivers/scsi/atari_NCR5380.c =================================================================== --- linux.orig/drivers/scsi/atari_NCR5380.c 2015-12-06 12:30:38.000000000 +1100 +++ linux/drivers/scsi/atari_NCR5380.c 2015-12-06 12:30:39.000000000 +1100 @@ -68,9 +68,6 @@ /* Adapted for the sun3 by Sam Creasey. */ -#include -#include - #if (NDEBUG & NDEBUG_LISTS) #define LIST(x, y) \ do { \ @@ -517,8 +514,6 @@ static inline int NCR5380_poll_politely( reg, bit, val, wait); } -#include - #if NDEBUG static struct { unsigned char mask; Index: linux/drivers/scsi/atari_scsi.c =================================================================== --- linux.orig/drivers/scsi/atari_scsi.c 2015-12-06 12:29:51.000000000 +1100 +++ linux/drivers/scsi/atari_scsi.c 2015-12-06 12:30:39.000000000 +1100 @@ -66,7 +66,6 @@ #include #include -#include #include #include #include Index: linux/drivers/scsi/dmx3191d.c =================================================================== --- linux.orig/drivers/scsi/dmx3191d.c 2015-12-06 12:29:51.000000000 +1100 +++ linux/drivers/scsi/dmx3191d.c 2015-12-06 12:30:39.000000000 +1100 @@ -41,11 +41,6 @@ #define NCR5380_implementation_fields /* none */ -/* - * Includes needed for NCR5380.[ch] (XXX: Move them to NCR5380.h) - */ -#include - #include "NCR5380.h" #include "NCR5380.c" Index: linux/drivers/scsi/dtc.c =================================================================== --- linux.orig/drivers/scsi/dtc.c 2015-12-06 12:30:34.000000000 +1100 +++ linux/drivers/scsi/dtc.c 2015-12-06 12:30:39.000000000 +1100 @@ -46,15 +46,13 @@ #include -#include #include -#include -#include #include #include #include #include #include + #include "dtc.h" #define AUTOPROBE_IRQ #include "NCR5380.h" Index: linux/drivers/scsi/g_NCR5380.c =================================================================== --- linux.orig/drivers/scsi/g_NCR5380.c 2015-12-06 12:30:34.000000000 +1100 +++ linux/drivers/scsi/g_NCR5380.c 2015-12-06 12:30:39.000000000 +1100 @@ -63,16 +63,14 @@ #endif #include -#include #include +#include #include #include "g_NCR5380.h" #include "NCR5380.h" -#include #include #include #include -#include #include static int ncr_irq; @@ -732,7 +730,7 @@ static struct scsi_host_template driver_ .cmd_per_lun = CMD_PER_LUN, .use_clustering = DISABLE_CLUSTERING, }; -#include + #include "scsi_module.c" module_param(ncr_irq, int, 0); Index: linux/drivers/scsi/mac_scsi.c =================================================================== --- linux.orig/drivers/scsi/mac_scsi.c 2015-12-06 12:30:02.000000000 +1100 +++ linux/drivers/scsi/mac_scsi.c 2015-12-06 12:30:39.000000000 +1100 @@ -12,7 +12,6 @@ */ #include -#include #include #include #include Index: linux/drivers/scsi/pas16.c =================================================================== --- linux.orig/drivers/scsi/pas16.c 2015-12-06 12:30:29.000000000 +1100 +++ linux/drivers/scsi/pas16.c 2015-12-06 12:30:39.000000000 +1100 @@ -69,14 +69,10 @@ #include -#include -#include #include #include #include -#include #include -#include #include #include Index: linux/drivers/scsi/t128.c =================================================================== --- linux.orig/drivers/scsi/t128.c 2015-12-06 12:29:51.000000000 +1100 +++ linux/drivers/scsi/t128.c 2015-12-06 12:30:39.000000000 +1100 @@ -68,14 +68,11 @@ * 15 9-11 */ -#include #include #include #include -#include #include #include -#include #include #include "t128.h" From mboxrd@z Thu Jan 1 00:00:00 1970 From: Finn Thain Subject: [PATCH v2 45/72] ncr5380: Cleanup #include directives Date: Sun, 06 Dec 2015 12:32:11 +1100 Message-ID: <20151206013138.155513733@telegraphics.com.au> References: <20151206013126.995379403@telegraphics.com.au> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline; filename=ncr5380-move-core-driver-includes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: "James E.J. Bottomley" , Michael Schmitz , linux-m68k@vger.kernel.org, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Russell King , linux-arm-kernel@lists.infradead.org List-Id: linux-m68k@vger.kernel.org Remove unused includes (stat.h, signal.h, proc_fs.h) and move includes needed by the core drivers into the common header (delay.h etc). Signed-off-by: Finn Thain --- drivers/scsi/NCR5380.c | 2 -- drivers/scsi/NCR5380.h | 4 ++++ drivers/scsi/arm/cumana_1.c | 4 ---- drivers/scsi/arm/oak.c | 2 -- drivers/scsi/atari_NCR5380.c | 5 ----- drivers/scsi/atari_scsi.c | 1 - drivers/scsi/dmx3191d.c | 5 ----- drivers/scsi/dtc.c | 4 +--- drivers/scsi/g_NCR5380.c | 6 ++---- drivers/scsi/mac_scsi.c | 1 - drivers/scsi/pas16.c | 4 ---- drivers/scsi/t128.c | 3 --- 12 files changed, 7 insertions(+), 34 deletions(-) Index: linux/drivers/scsi/NCR5380.c =================================================================== --- linux.orig/drivers/scsi/NCR5380.c 2015-12-06 12:30:38.000000000 +1100 +++ linux/drivers/scsi/NCR5380.c 2015-12-06 12:30:39.000000000 +1100 @@ -79,8 +79,6 @@ * 4. Test SCSI-II tagged queueing (I have no devices which support * tagged queueing) */ -#include -#include #if (NDEBUG & NDEBUG_LISTS) #define LIST(x,y) {printk("LINE:%d Adding %p to %p\n", __LINE__, (void*)(x), (void*)(y)); if ((x)==(y)) udelay(5); } Index: linux/drivers/scsi/NCR5380.h =================================================================== --- linux.orig/drivers/scsi/NCR5380.h 2015-12-06 12:30:34.000000000 +1100 +++ linux/drivers/scsi/NCR5380.h 2015-12-06 12:30:39.000000000 +1100 @@ -22,8 +22,12 @@ #ifndef NCR5380_H #define NCR5380_H +#include #include +#include +#include #include +#include #define NDEBUG_ARBITRATION 0x1 #define NDEBUG_AUTOSENSE 0x2 Index: linux/drivers/scsi/arm/cumana_1.c =================================================================== --- linux.orig/drivers/scsi/arm/cumana_1.c 2015-12-06 12:30:02.000000000 +1100 +++ linux/drivers/scsi/arm/cumana_1.c 2015-12-06 12:30:39.000000000 +1100 @@ -4,9 +4,7 @@ * Copyright 1995-2002, Russell King */ #include -#include #include -#include #include #include @@ -15,8 +13,6 @@ #include -#include - #define PSEUDO_DMA #define priv(host) ((struct NCR5380_hostdata *)(host)->hostdata) Index: linux/drivers/scsi/arm/oak.c =================================================================== --- linux.orig/drivers/scsi/arm/oak.c 2015-12-06 12:30:02.000000000 +1100 +++ linux/drivers/scsi/arm/oak.c 2015-12-06 12:30:39.000000000 +1100 @@ -5,9 +5,7 @@ */ #include -#include #include -#include #include #include Index: linux/drivers/scsi/atari_NCR5380.c =================================================================== --- linux.orig/drivers/scsi/atari_NCR5380.c 2015-12-06 12:30:38.000000000 +1100 +++ linux/drivers/scsi/atari_NCR5380.c 2015-12-06 12:30:39.000000000 +1100 @@ -68,9 +68,6 @@ /* Adapted for the sun3 by Sam Creasey. */ -#include -#include - #if (NDEBUG & NDEBUG_LISTS) #define LIST(x, y) \ do { \ @@ -517,8 +514,6 @@ static inline int NCR5380_poll_politely( reg, bit, val, wait); } -#include - #if NDEBUG static struct { unsigned char mask; Index: linux/drivers/scsi/atari_scsi.c =================================================================== --- linux.orig/drivers/scsi/atari_scsi.c 2015-12-06 12:29:51.000000000 +1100 +++ linux/drivers/scsi/atari_scsi.c 2015-12-06 12:30:39.000000000 +1100 @@ -66,7 +66,6 @@ #include #include -#include #include #include #include Index: linux/drivers/scsi/dmx3191d.c =================================================================== --- linux.orig/drivers/scsi/dmx3191d.c 2015-12-06 12:29:51.000000000 +1100 +++ linux/drivers/scsi/dmx3191d.c 2015-12-06 12:30:39.000000000 +1100 @@ -41,11 +41,6 @@ #define NCR5380_implementation_fields /* none */ -/* - * Includes needed for NCR5380.[ch] (XXX: Move them to NCR5380.h) - */ -#include - #include "NCR5380.h" #include "NCR5380.c" Index: linux/drivers/scsi/dtc.c =================================================================== --- linux.orig/drivers/scsi/dtc.c 2015-12-06 12:30:34.000000000 +1100 +++ linux/drivers/scsi/dtc.c 2015-12-06 12:30:39.000000000 +1100 @@ -46,15 +46,13 @@ #include -#include #include -#include -#include #include #include #include #include #include + #include "dtc.h" #define AUTOPROBE_IRQ #include "NCR5380.h" Index: linux/drivers/scsi/g_NCR5380.c =================================================================== --- linux.orig/drivers/scsi/g_NCR5380.c 2015-12-06 12:30:34.000000000 +1100 +++ linux/drivers/scsi/g_NCR5380.c 2015-12-06 12:30:39.000000000 +1100 @@ -63,16 +63,14 @@ #endif #include -#include #include +#include #include #include "g_NCR5380.h" #include "NCR5380.h" -#include #include #include #include -#include #include static int ncr_irq; @@ -732,7 +730,7 @@ static struct scsi_host_template driver_ .cmd_per_lun = CMD_PER_LUN, .use_clustering = DISABLE_CLUSTERING, }; -#include + #include "scsi_module.c" module_param(ncr_irq, int, 0); Index: linux/drivers/scsi/mac_scsi.c =================================================================== --- linux.orig/drivers/scsi/mac_scsi.c 2015-12-06 12:30:02.000000000 +1100 +++ linux/drivers/scsi/mac_scsi.c 2015-12-06 12:30:39.000000000 +1100 @@ -12,7 +12,6 @@ */ #include -#include #include #include #include Index: linux/drivers/scsi/pas16.c =================================================================== --- linux.orig/drivers/scsi/pas16.c 2015-12-06 12:30:29.000000000 +1100 +++ linux/drivers/scsi/pas16.c 2015-12-06 12:30:39.000000000 +1100 @@ -69,14 +69,10 @@ #include -#include -#include #include #include #include -#include #include -#include #include #include Index: linux/drivers/scsi/t128.c =================================================================== --- linux.orig/drivers/scsi/t128.c 2015-12-06 12:29:51.000000000 +1100 +++ linux/drivers/scsi/t128.c 2015-12-06 12:30:39.000000000 +1100 @@ -68,14 +68,11 @@ * 15 9-11 */ -#include #include #include #include -#include #include #include -#include #include #include "t128.h" From mboxrd@z Thu Jan 1 00:00:00 1970 From: fthain@telegraphics.com.au (Finn Thain) Date: Sun, 06 Dec 2015 12:32:11 +1100 Subject: [PATCH v2 45/72] ncr5380: Cleanup #include directives References: <20151206013126.995379403@telegraphics.com.au> Message-ID: <20151206013138.155513733@telegraphics.com.au> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org An embedded and charset-unspecified text was scrubbed... Name: ncr5380-move-core-driver-includes URL: