* [PATCH 3/4] DocBook/mtdnand: fix ioremap return type
@ 2010-01-02 4:35 Randy Dunlap
0 siblings, 0 replies; only message in thread
From: Randy Dunlap @ 2010-01-02 4:35 UTC (permalink / raw)
To: lkml, torvalds; +Cc: H Hartley Sweeten, David Woodhouse
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Subject: DocBook: fix ioremap return type
ioremap() returns a void __iomem * not an unsigned long. Update the
Documentation file to reflect this.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: David Woodhouse <dwmw2@infradead.org>
---
Documentation/DocBook/mtdnand.tmpl | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
--- linux-2.6.33-rc2-git4.orig/Documentation/DocBook/mtdnand.tmpl
+++ linux-2.6.33-rc2-git4/Documentation/DocBook/mtdnand.tmpl
@@ -174,7 +174,7 @@
</para>
<programlisting>
static struct mtd_info *board_mtd;
-static unsigned long baseaddr;
+static void __iomem *baseaddr;
</programlisting>
<para>
Static example
@@ -182,7 +182,7 @@ static unsigned long baseaddr;
<programlisting>
static struct mtd_info board_mtd;
static struct nand_chip board_chip;
-static unsigned long baseaddr;
+static void __iomem *baseaddr;
</programlisting>
</sect1>
<sect1 id="Partition_defines">
@@ -283,8 +283,8 @@ int __init board_init (void)
}
/* map physical address */
- baseaddr = (unsigned long)ioremap(CHIP_PHYSICAL_ADDRESS, 1024);
- if(!baseaddr){
+ baseaddr = ioremap(CHIP_PHYSICAL_ADDRESS, 1024);
+ if (!baseaddr) {
printk("Ioremap to access NAND chip failed\n");
err = -EIO;
goto out_mtd;
@@ -316,7 +316,7 @@ int __init board_init (void)
goto out;
out_ior:
- iounmap((void *)baseaddr);
+ iounmap(baseaddr);
out_mtd:
kfree (board_mtd);
out:
@@ -341,7 +341,7 @@ static void __exit board_cleanup (void)
nand_release (board_mtd);
/* unmap physical address */
- iounmap((void *)baseaddr);
+ iounmap(baseaddr);
/* Free the MTD device structure */
kfree (board_mtd);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-01-02 4:37 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-01-02 4:35 [PATCH 3/4] DocBook/mtdnand: fix ioremap return type Randy Dunlap
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome