Patchwork Please fix or remove OMAP2 onenand driver

login
register
mail settings
Submitter Adrian Hunter
Date Nov. 24, 2008, 12:44 p.m.
Message ID <492AA1B4.9030803@nokia.com>
Download mbox | patch
Permalink /patch/10393/
State New
Headers show

Comments

Adrian Hunter - Nov. 24, 2008, 12:44 p.m.
ext Russell King - ARM Linux wrote:
> On Mon, Nov 24, 2008 at 01:37:05PM +0200, Adrian Hunter wrote:
>> From: Adrian Hunter <ext-adrian.hunter@nokia.com>
>> Date: Mon, 24 Nov 2008 13:34:53 +0200
>> Subject: [PATCH] MTD: OMAP: OneNAND: header file relocation
>>
>> Signed-off-by: Adrian Hunter <ext-adrian.hunter@nokia.com>
> 
> Thanks.  Only two comments (see below).
> 
>> ---
>> drivers/mtd/onenand/omap2.c |   12 ++++++------
>> 1 files changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
>> index e39b21d..28034ef 100644
>> --- a/drivers/mtd/onenand/omap2.c
>> +++ b/drivers/mtd/onenand/omap2.c
>> @@ -35,16 +35,16 @@
>>
>> #include <asm/io.h>
> 
> Should be linux/io.h and should be with the other linux/ includes.
> 
>> #include <asm/mach/flash.h>
>> -#include <asm/arch/gpmc.h>
>> -#include <asm/arch/onenand.h>
>> -#include <asm/arch/gpio.h>
>> -#include <asm/arch/pm.h>
>> +#include <mach/gpmc.h>
>> +#include <mach/onenand.h>
>> +#include <mach/gpio.h>
>> +#include <mach/pm.h>
>>
>> #include <linux/dma-mapping.h>
>> #include <asm/dma-mapping.h>
> 
> asm/dma-mapping.h should not be included - only linux/dma-mapping.h, and
> that should be up with the other linux/ includes.
> 
>> -#include <asm/arch/dma.h>
>> +#include <mach/dma.h>
>>
>> -#include <asm/arch/board.h>
>> +#include <mach/board.h>
>>
>> #define DRIVER_NAME "omap2-onenand"
>>
>> -- 
>> 1.5.4.3
> 

From: Adrian Hunter <ext-adrian.hunter@nokia.com>
Date: Mon, 24 Nov 2008 13:34:53 +0200
Subject: [PATCH] MTD: OMAP: OneNAND: header file relocation

Signed-off-by: Adrian Hunter <ext-adrian.hunter@nokia.com>
---
 drivers/mtd/onenand/omap2.c |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)
Russell King - ARM Linux - Nov. 26, 2008, 9:57 a.m.
On Mon, Nov 24, 2008 at 02:44:36PM +0200, Adrian Hunter wrote:
> From: Adrian Hunter <ext-adrian.hunter@nokia.com>
> Date: Mon, 24 Nov 2008 13:34:53 +0200
> Subject: [PATCH] MTD: OMAP: OneNAND: header file relocation
> 
> Signed-off-by: Adrian Hunter <ext-adrian.hunter@nokia.com>

Great.

Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>

David, can you merge this patch for 2.6.28 please?

> ---
> drivers/mtd/onenand/omap2.c |   17 ++++++++---------
> 1 files changed, 8 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
> index e39b21d..a7e4d98 100644
> --- a/drivers/mtd/onenand/omap2.c
> +++ b/drivers/mtd/onenand/omap2.c
> @@ -32,19 +32,18 @@
> #include <linux/platform_device.h>
> #include <linux/interrupt.h>
> #include <linux/delay.h>
> +#include <linux/dma-mapping.h>
> +#include <linux/io.h>
> 
> -#include <asm/io.h>
> #include <asm/mach/flash.h>
> -#include <asm/arch/gpmc.h>
> -#include <asm/arch/onenand.h>
> -#include <asm/arch/gpio.h>
> -#include <asm/arch/pm.h>
> +#include <mach/gpmc.h>
> +#include <mach/onenand.h>
> +#include <mach/gpio.h>
> +#include <mach/pm.h>
> 
> -#include <linux/dma-mapping.h>
> -#include <asm/dma-mapping.h>
> -#include <asm/arch/dma.h>
> +#include <mach/dma.h>
> 
> -#include <asm/arch/board.h>
> +#include <mach/board.h>
> 
> #define DRIVER_NAME "omap2-onenand"
> 
> -- 
> 1.5.4.3

Patch

diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index e39b21d..a7e4d98 100644
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -32,19 +32,18 @@ 
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
+#include <linux/dma-mapping.h>
+#include <linux/io.h>
 
-#include <asm/io.h>
 #include <asm/mach/flash.h>
-#include <asm/arch/gpmc.h>
-#include <asm/arch/onenand.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/pm.h>
+#include <mach/gpmc.h>
+#include <mach/onenand.h>
+#include <mach/gpio.h>
+#include <mach/pm.h>
 
-#include <linux/dma-mapping.h>
-#include <asm/dma-mapping.h>
-#include <asm/arch/dma.h>
+#include <mach/dma.h>
 
-#include <asm/arch/board.h>
+#include <mach/board.h>
 
 #define DRIVER_NAME "omap2-onenand"