From patchwork Fri Jan 25 07:09:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 10780693 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CB6B3922 for ; Fri, 25 Jan 2019 07:18:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A45762CDDC for ; Fri, 25 Jan 2019 07:18:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 905BB2F60F; Fri, 25 Jan 2019 07:18:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 477372F521 for ; Fri, 25 Jan 2019 07:18:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728376AbfAYHSw (ORCPT ); Fri, 25 Jan 2019 02:18:52 -0500 Received: from condef-05.nifty.com ([202.248.20.70]:59988 "EHLO condef-05.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726271AbfAYHSw (ORCPT ); Fri, 25 Jan 2019 02:18:52 -0500 X-Greylist: delayed 322 seconds by postgrey-1.27 at vger.kernel.org; Fri, 25 Jan 2019 02:18:50 EST Received: from conuserg-12.nifty.com ([10.126.8.75])by condef-05.nifty.com with ESMTP id x0P79esX019883 for ; Fri, 25 Jan 2019 16:09:41 +0900 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id x0P79685005418; Fri, 25 Jan 2019 16:09:08 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com x0P79685005418 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1548400149; bh=WRJv1jJ47KBMznet3o5QY0xF48L7ExBwayWhvperHXQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pCOpj7QU2RPJ6WtncXSvWLMZ7HSyPD4llCORnpgfS9JvOkOv0A5hgd02rgcODAeTu BjNGZpVgEwAM5Qbu1OB1mUCM5+W+z7999KORNAd/YOcUgRC+mlG9CfgvuaFZulPXcW XQa9NAHlR0ai2KWNxvVYTqztvOFCz6UuqudequCu3SY71QJD1KvGoDCeBfkLec4/MU MwRcf7f5a+tHKeG0mCJFGsMW1bSGsT655VqRAGcRp6Jcsvcy8qp7zMMyC0BmUjn+DI jLQzxjvOXXHpZt7ROOqVS3iPG/M2c1mAorKeS7gMWhAjYd2c5RPmJbaDvf40GDf6yh 26NBrMpI1UDMg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: "James E . J . Bottomley" , "Martin K . Petersen" , linux-scsi@vger.kernel.org Cc: Masahiro Yamada , Don Brace , esc.storagedev@microsemi.com, Hannes Reinecke , linux-kernel@vger.kernel.org, Adaptec OEM Raid Solutions Subject: [PATCH 1/2] scsi: remove unneeded header search paths Date: Fri, 25 Jan 2019 16:09:03 +0900 Message-Id: <1548400144-22513-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1548400144-22513-1-git-send-email-yamada.masahiro@socionext.com> References: <1548400144-22513-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP I was able to build without these extra header search paths. Especially, the header search path -I. in kernel Makefiles is always suspicious; it allows the compiler to search for headers in the top of $(srctree), where obviously no header file exists. Signed-off-by: Masahiro Yamada --- drivers/scsi/aacraid/Makefile | 2 -- drivers/scsi/aic7xxx/Makefile | 1 - drivers/scsi/smartpqi/Makefile | 1 - 3 files changed, 4 deletions(-) diff --git a/drivers/scsi/aacraid/Makefile b/drivers/scsi/aacraid/Makefile index 1bd9fd1..3893b95 100644 --- a/drivers/scsi/aacraid/Makefile +++ b/drivers/scsi/aacraid/Makefile @@ -4,5 +4,3 @@ obj-$(CONFIG_SCSI_AACRAID) := aacraid.o aacraid-objs := linit.o aachba.o commctrl.o comminit.o commsup.o \ dpcsup.o rx.o sa.o rkt.o nark.o src.o - -ccflags-y := -Idrivers/scsi diff --git a/drivers/scsi/aic7xxx/Makefile b/drivers/scsi/aic7xxx/Makefile index c15be25..e0188ec 100644 --- a/drivers/scsi/aic7xxx/Makefile +++ b/drivers/scsi/aic7xxx/Makefile @@ -34,7 +34,6 @@ aic79xx-y += aic79xx_osm.o \ aic79xx_proc.o \ aic79xx_osm_pci.o -ccflags-y += -Idrivers/scsi ifdef WARNINGS_BECOME_ERRORS ccflags-y += -Werror endif diff --git a/drivers/scsi/smartpqi/Makefile b/drivers/scsi/smartpqi/Makefile index e6b7799..a03a6ed 100644 --- a/drivers/scsi/smartpqi/Makefile +++ b/drivers/scsi/smartpqi/Makefile @@ -1,3 +1,2 @@ -ccflags-y += -I. obj-$(CONFIG_SCSI_SMARTPQI) += smartpqi.o smartpqi-objs := smartpqi_init.o smartpqi_sis.o smartpqi_sas_transport.o From patchwork Fri Jan 25 07:09:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 10780697 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C7A26922 for ; Fri, 25 Jan 2019 07:21:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ABD932F703 for ; Fri, 25 Jan 2019 07:21:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9E5AC2F81E; Fri, 25 Jan 2019 07:21:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A4B42F703 for ; Fri, 25 Jan 2019 07:21:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726779AbfAYHVp (ORCPT ); Fri, 25 Jan 2019 02:21:45 -0500 Received: from condef-09.nifty.com ([202.248.20.74]:46761 "EHLO condef-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726271AbfAYHVp (ORCPT ); Fri, 25 Jan 2019 02:21:45 -0500 Received: from conuserg-12.nifty.com ([10.126.8.75])by condef-09.nifty.com with ESMTP id x0P79Omc007507 for ; Fri, 25 Jan 2019 16:09:24 +0900 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id x0P79686005418; Fri, 25 Jan 2019 16:09:09 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com x0P79686005418 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1548400150; bh=Vpn6bjURzAVS1rpEMtJUUe+enwqt45OopaWYKJnvavg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MQHU+TxIv4+a+PFQXAx/U8YFlpzc983Q1mO8xetF1ENicMLFvTRGj5A84sKjfb7o4 DslC9k8hGY1RjVcTM3qxvM5za9eyTJ/w6XIDIYbBEcyYtCvb11EN0RYLFpKhp3T5QB fNYD3lNEoiQflLz+fCXlU4LoMTUEPsxVqdFOBz1w4igO+g4MDRya73nHwKbAdM1m3P rXDXt+6KhZgxvBG156IRFVQAP/6A6qhv44g3nX7Eb/eYeVCANLM5zdocx9U8P3GXQ3 g9zkyc9Rk9sHBoJ9XPRJwuBxXczncPiy+bahuHR+kIRbMtWWRcEXcb0nNWxrR2+bzf gLjqYahSutU9w== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: "James E . J . Bottomley" , "Martin K . Petersen" , linux-scsi@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] scsi: prefix header search paths with $(srctree)/ Date: Fri, 25 Jan 2019 16:09:04 +0900 Message-Id: <1548400144-22513-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1548400144-22513-1-git-send-email-yamada.masahiro@socionext.com> References: <1548400144-22513-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently, the Kbuild core manipulates header search paths in a crazy way [1]. To fix this mess, I want all Makefiles to add explicit $(srctree)/ to the search paths in the srctree. Some Makefiles are already written in that way, but not all. The goal of this work is to make the notation consistent, and finally get rid of the gross hacks. Having whitespaces after -I does not matter since commit 48f6e3cf5bc6 ("kbuild: do not drop -I without parameter"). [1]: https://patchwork.kernel.org/patch/9632347/ Signed-off-by: Masahiro Yamada --- drivers/scsi/cxgbi/Makefile | 2 +- drivers/scsi/pcmcia/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/cxgbi/Makefile b/drivers/scsi/cxgbi/Makefile index a73781a..f78c9cc 100644 --- a/drivers/scsi/cxgbi/Makefile +++ b/drivers/scsi/cxgbi/Makefile @@ -1,4 +1,4 @@ -ccflags-y += -Idrivers/net/ethernet/chelsio/libcxgb +ccflags-y += -I $(srctree)/drivers/net/ethernet/chelsio/libcxgb obj-$(CONFIG_SCSI_CXGB3_ISCSI) += libcxgbi.o cxgb3i/ obj-$(CONFIG_SCSI_CXGB4_ISCSI) += libcxgbi.o cxgb4i/ diff --git a/drivers/scsi/pcmcia/Makefile b/drivers/scsi/pcmcia/Makefile index faa87a4..a5a24dd 100644 --- a/drivers/scsi/pcmcia/Makefile +++ b/drivers/scsi/pcmcia/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 -ccflags-y := -Idrivers/scsi +ccflags-y := -I $(srctree)/drivers/scsi # 16-bit client drivers obj-$(CONFIG_PCMCIA_QLOGIC) += qlogic_cs.o