mtd/drivers/mtd/nand s3c2410.c,1.7,1.8

bjd at infradead.org bjd at infradead.org
Fri Feb 18 09:46:15 EST 2005


Update of /home/cvs/mtd/drivers/mtd/nand
In directory phoenix.infradead.org:/tmp/cvs-serv13696/drivers/mtd/nand

Modified Files:
	s3c2410.c 
Log Message:
Fix sparse errors due to lack of address-space markers
Updated header comments
Small re-format of initialiser


Index: s3c2410.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/nand/s3c2410.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- s3c2410.c	5 Jan 2005 18:05:14 -0000	1.7
+++ s3c2410.c	18 Feb 2005 14:46:12 -0000	1.8
@@ -1,7 +1,8 @@
 /* linux/drivers/mtd/nand/s3c2410.c
  *
  * Copyright (c) 2004 Simtec Electronics
- * Ben Dooks <ben at simtec.co.uk>
+ *	http://www.simtec.co.uk/products/SWLINUX/
+ *	Ben Dooks <ben at simtec.co.uk>
  *
  * Samsung S3C2410 NAND driver
  *
@@ -10,6 +11,7 @@
  *	23-Sep-2004  BJD  Mulitple device support
  *	28-Sep-2004  BJD  Fixed ECC placement for Hardware mode
  *	12-Oct-2004  BJD  Fixed errors in use of platform data
+ *	18-Feb-2004  BJD  Fix sparse errors
  *
  * $Id$
  *
@@ -69,10 +71,10 @@
  */
 
 static struct nand_oobinfo nand_hw_eccoob = {
-	.useecc = MTD_NANDECC_AUTOPLACE,
-	.eccbytes = 3,
-	.eccpos = {0, 1, 2 },
-	.oobfree = { {8, 8} }
+	.useecc		= MTD_NANDECC_AUTOPLACE,
+	.eccbytes	= 3,
+	.eccpos		= {0, 1, 2 },
+	.oobfree	= { {8, 8} }
 };
 
 /* controller and mtd information */
@@ -99,7 +101,7 @@
 	struct device			*device;
 	struct resource			*area;
 	struct clk			*clk;
-	void				*regs;
+	void __iomem			*regs;
 	int				mtd_count;
 };
 
@@ -523,8 +525,8 @@
 {
 	struct nand_chip *chip = &nmtd->chip;
 
-	chip->IO_ADDR_R	   = (char *)info->regs + S3C2410_NFDATA;
-	chip->IO_ADDR_W    = (char *)info->regs + S3C2410_NFDATA;
+	chip->IO_ADDR_R	   = info->regs + S3C2410_NFDATA;
+	chip->IO_ADDR_W    = info->regs + S3C2410_NFDATA;
 	chip->hwcontrol    = s3c2410_nand_hwcontrol;
 	chip->dev_ready    = s3c2410_nand_devready;
 	chip->cmdfunc      = s3c2410_nand_command;





More information about the linux-mtd-cvs mailing list