From patchwork Thu Sep 15 15:41:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101783 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp19733qgf; Thu, 15 Sep 2016 08:42:43 -0700 (PDT) X-Received: by 10.98.152.138 with SMTP id d10mr1482125pfk.8.1473954162985; Thu, 15 Sep 2016 08:42:42 -0700 (PDT) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id i135si22991575pfe.3.2016.09.15.08.42.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Sep 2016 08:42:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-mtd-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-mtd-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-mtd-bounces+patch=linaro.org@lists.infradead.org Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bkYnm-0004VF-9a; Thu, 15 Sep 2016 15:42:14 +0000 Received: from mout.kundenserver.de ([212.227.126.134]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bkYnd-0004PX-RM for linux-mtd@lists.infradead.org; Thu, 15 Sep 2016 15:42:10 +0000 Received: from wuerfel.lan. ([78.43.20.153]) by mrelayeu.kundenserver.de (mreue003) with ESMTPA (Nemesis) id 0Ll1ub-1bCbU82j3d-00aoZe; Thu, 15 Sep 2016 17:41:41 +0200 From: Arnd Bergmann To: David Woodhouse , Brian Norris Subject: [PATCH] mtd: spi-nor: don't include linux/mtd/cfi.h from header Date: Thu, 15 Sep 2016 17:41:11 +0200 Message-Id: <20160915154139.3003332-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:Bm4gATuJ887oON70htKO3HogeyCFYYCtKShljigBei8c8PwkxQK oZZg7fhzVjTkgh2GrqL2x0Xl7MVaIFd0Rc2EaPoef591y3pFaMvAyGQunLtKVWWHsylVx5v TE0EAoAZuCpUFJZOu6bcqY85HiVvJFkITdakZ3Uc77GJqDzLhW8UBhbgcNp6tGF9ysWXkFv 7yGw45JnQ2/w6okylSlaA== X-UI-Out-Filterresults: notjunk:1; V01:K0:d7C2JDz2xhQ=:0I71TR1P1lG6Kf7xQMuYz+ 2io6kkZ1EjM54YQhUX9HbYdey9Lu1RlMO84COZ8j2VCdcbTMMojTqV9OUS27HSNvIDYHCbWN+ 35K4tVhrSGjgPjYb2p2/5G30/+065UaQc+R9uXbAPslGUh8YnSkkAl3k/ABeXg8MgdTkPqUnk HGos2nglDmqOq08e/DaJwuckyMHc/d9nz4+z6KiLg/nwxNABTWQC8pDgu3LHYqXSTQHi2L/rm za4ww2d9TyWIZoyMqy2/S609DcH5B0iV8WuzBT2En1GqQipdQAlcB3T0BwC4BbhG9rK5SL3Nw Vs/frzXqDvC9m2y7yNKvqrot5ele3MZ9/COGrNwr4uB+3MNVOXigSHO8QnaATfuto7P9f92p0 zflbivq5FOmU4QhMxQn8Lj/1wmLryHP2JZXEjFwENEHPlWfOtKSTGHABFdX/9Qz6KgAzAk4LF 9b8OsLT6aPHhQIVkvRVdGWCG7jaAEPhpT8t4z2bAqhgd+3XiV8NJwCyNDRJIrJ511co6kOJMS gkE9GF6jl8C0prQPbiawLvxjsxxcJnO6Ggd8lEu9Pyj7gryDL9gaQT9yf3zNhwi4Q2n4Q2zY+ uEgms0GSlRo9CETN2RXkyNAcpwhtQ+pxrKLIuhWwwA2GNlaPM8YaNroJ4YY/0++H388TNIdFg TtyM4yZy+rSNFb8PuIKS0VufurwPirqdZdtmK/mJ/bUCCj0yU4EOhIx3neftwAfu6vqQ= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160915_084206_255898_289DDE44 X-CRM114-Status: GOOD ( 11.72 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.134 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.134 listed in wl.mailspike.net] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Boris Brezillon , Michal Suchanek , Arnd Bergmann , linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org, =?utf-8?q?Ezequiel_Garc=C3=ADa?= MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+patch=linaro.org@lists.infradead.org The newly added broadcom qspi driver in drivers/spi produces a build warning when CONFIG_MTD is disabled: include/linux/mtd/cfi.h:76:2: #warning No CONFIG_MTD_CFI_Ix selected. No NOR chip support can work. [-Werror=cpp] Since drivers like this one don't actually need the cfi.h header, we can just remove it from the spi-nor.h file and add it to the only place that actually needs it. Signed-off-by: Arnd Bergmann Fixes: fa236a7ef240 ("spi: bcm-qspi: Add Broadcom MSPI driver") --- drivers/mtd/spi-nor/spi-nor.c | 1 + include/linux/mtd/spi-nor.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/ diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index d0fc165d7d66..94afcb9fdaf7 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -21,6 +21,7 @@ #include #include #include +#include #include /* Define max times to check status register before we give up. */ diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index c425c7b4c2a0..60ef29565743 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -11,7 +11,6 @@ #define __LINUX_MTD_SPI_NOR_H #include -#include #include /*