From patchwork Wed Nov 18 08:35:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Finn Thain X-Patchwork-Id: 7646191 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0B8AC9F1D3 for ; Wed, 18 Nov 2015 08:50:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DEFA220607 for ; Wed, 18 Nov 2015 08:50:08 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C4771205FA for ; Wed, 18 Nov 2015 08:50:07 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZyyP7-0004Oy-AQ; Wed, 18 Nov 2015 08:47:49 +0000 Received: from kvm5.telegraphics.com.au ([98.124.60.144]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZyyOL-0003xI-K3 for linux-arm-kernel@lists.infradead.org; Wed, 18 Nov 2015 08:47:04 +0000 Received: by kvm5.telegraphics.com.au (Postfix, from userid 502) id E79CD22969; Wed, 18 Nov 2015 03:46:20 -0500 (EST) Message-Id: <20151118083508.907628539@telegraphics.com.au> User-Agent: quilt/0.50-1 Date: Wed, 18 Nov 2015 19:35:40 +1100 From: Finn Thain To: "James E.J. Bottomley" , Michael Schmitz , , , , Russell King , linux-arm-kernel@lists.infradead.org Subject: [PATCH 45/71] ncr5380: Cleanup #include directives References: <20151118083455.331768508@telegraphics.com.au> Content-Disposition: inline; filename=ncr5380-move-core-driver-includes X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151118_004702_047368_F4818B20 X-CRM114-Status: GOOD ( 10.89 ) X-Spam-Score: -2.5 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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-11-18 19:34:00.000000000 +1100 +++ linux/drivers/scsi/NCR5380.c 2015-11-18 19:34:01.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-11-18 19:33:56.000000000 +1100 +++ linux/drivers/scsi/NCR5380.h 2015-11-18 19:34:01.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-11-18 19:33:35.000000000 +1100 +++ linux/drivers/scsi/arm/cumana_1.c 2015-11-18 19:34:01.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-11-18 19:33:35.000000000 +1100 +++ linux/drivers/scsi/arm/oak.c 2015-11-18 19:34:01.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-11-18 19:34:00.000000000 +1100 +++ linux/drivers/scsi/atari_NCR5380.c 2015-11-18 19:34:01.000000000 +1100 @@ -68,9 +68,6 @@ /* Adapted for the sun3 by Sam Creasey. */ -#include -#include - #if (NDEBUG & NDEBUG_LISTS) #define LIST(x, y) \ do { \ @@ -528,8 +525,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-11-18 19:33:27.000000000 +1100 +++ linux/drivers/scsi/atari_scsi.c 2015-11-18 19:34:01.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-11-18 19:33:27.000000000 +1100 +++ linux/drivers/scsi/dmx3191d.c 2015-11-18 19:34:01.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-11-18 19:33:56.000000000 +1100 +++ linux/drivers/scsi/dtc.c 2015-11-18 19:34:01.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-11-18 19:33:56.000000000 +1100 +++ linux/drivers/scsi/g_NCR5380.c 2015-11-18 19:34:01.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; @@ -733,7 +731,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-11-18 19:33:35.000000000 +1100 +++ linux/drivers/scsi/mac_scsi.c 2015-11-18 19:34:01.000000000 +1100 @@ -12,7 +12,6 @@ */ #include -#include #include #include #include Index: linux/drivers/scsi/pas16.c =================================================================== --- linux.orig/drivers/scsi/pas16.c 2015-11-18 19:33:52.000000000 +1100 +++ linux/drivers/scsi/pas16.c 2015-11-18 19:34:01.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-11-18 19:33:27.000000000 +1100 +++ linux/drivers/scsi/t128.c 2015-11-18 19:34:01.000000000 +1100 @@ -68,14 +68,11 @@ * 15 9-11 */ -#include #include #include #include -#include #include #include -#include #include #include "t128.h"