From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758922Ab2DJTGp (ORCPT ); Tue, 10 Apr 2012 15:06:45 -0400 Received: from smtp2.mail.ru ([94.100.176.130]:36421 "EHLO smtp2.mail.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758818Ab2DJTGm (ORCPT ); Tue, 10 Apr 2012 15:06:42 -0400 From: Dmitry Artamonow To: linux-mmc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Chris Ball , linux-kernel@vger.kernel.org, Ludovic Desroches , Pavel Pisa , Sascha Hauer , Will Newton Subject: [PATCH] mmc: remove linux/blkdev.h include from host drivers Date: Tue, 10 Apr 2012 23:06:23 +0400 Message-Id: <1334084783-3572-1-git-send-email-mad_soft@inbox.ru> X-Mailer: git-send-email 1.7.5.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam: Not detected X-Mras: Ok Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org None of mmc host drivers using linux/blkdev.h header really need anything from it. The slight exception is atmel-mci, which uses blkdev.h only because it indirectly pulls asm/cacheflush.h So remove any inclusion of blkdev.h - it should also fix build errors of dw_mmc and atmel-mci drivers when CONFIG_BLOCK is disabled, like following: ------------------------------------------------------ In file included from drivers/mmc/host/dw_mmc.c:14:0: include/linux/blkdev.h:1408:42: warning: ‘struct task_struct’ declared inside parameter list [enabled by default] include/linux/blkdev.h:1408:42: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default] include/linux/blkdev.h:1412:51: warning: ‘struct task_struct’ declared inside parameter list [enabled by default] include/linux/blkdev.h:1417:1: error: unknown type name ‘bool’ include/linux/blkdev.h:1417:48: warning: ‘struct task_struct’ declared inside parameter list [enabled by default] include/linux/blkdev.h: In function ‘blk_needs_flush_plug’: include/linux/blkdev.h:1419:9: error: ‘false’ undeclared (first use in this function) include/linux/blkdev.h:1419:9: note: each undeclared identifier is reported only once for each function it appears in make[1]: *** [drivers/mmc/host/dw_mmc.o] Error 1 make: *** [drivers/mmc/host/dw_mmc.o] Error 2 ------------------------------------------------------ Cc: Ludovic Desroches Cc: Pavel Pisa Cc: Sascha Hauer Cc: Will Newton Signed-off-by: Dmitry Artamonow --- drivers/mmc/host/at91_mci.c | 1 - drivers/mmc/host/atmel-mci.c | 2 +- drivers/mmc/host/dw_mmc.c | 1 - drivers/mmc/host/imxmmc.c | 1 - drivers/mmc/host/mxcmmc.c | 1 - 5 files changed, 1 insertions(+), 5 deletions(-) I've compile tested everything with and without CONFIG_BLOCK enabled, except for imxmmc.c - this driver seems to be long time broken (at least since the removal of mach-imx in 2.6.31 - see commit 1341d34ffc296f98dc84876f35f3151525dc02a2 ) If there any plans to remove imxmmc.c soon, I can drop corresponding chunk from this patch and resend it to not create conflicts. diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c index efdb81d..bf43df4 100644 --- a/drivers/mmc/host/at91_mci.c +++ b/drivers/mmc/host/at91_mci.c @@ -59,7 +59,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index 9819dc0..1304549 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -7,7 +7,6 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#include #include #include #include @@ -33,6 +32,7 @@ #include #include +#include #include #include diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index bf3c9b4..757580b 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -11,7 +11,6 @@ * (at your option) any later version. */ -#include #include #include #include diff --git a/drivers/mmc/host/imxmmc.c b/drivers/mmc/host/imxmmc.c index ea0f3ce..6479964 100644 --- a/drivers/mmc/host/imxmmc.c +++ b/drivers/mmc/host/imxmmc.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c index b2058b4..b511861 100644 --- a/drivers/mmc/host/mxcmmc.c +++ b/drivers/mmc/host/mxcmmc.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include -- 1.7.5.4