Commit 8d9f99c3 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Linus Torvalds

DocBook: fix ioremap return type

ioremap() returns a void __iomem * not an unsigned long.  Update the
Documentation file to reflect this.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 143724fd
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
</para> </para>
<programlisting> <programlisting>
static struct mtd_info *board_mtd; static struct mtd_info *board_mtd;
static unsigned long baseaddr; static void __iomem *baseaddr;
</programlisting> </programlisting>
<para> <para>
Static example Static example
...@@ -182,7 +182,7 @@ static unsigned long baseaddr; ...@@ -182,7 +182,7 @@ static unsigned long baseaddr;
<programlisting> <programlisting>
static struct mtd_info board_mtd; static struct mtd_info board_mtd;
static struct nand_chip board_chip; static struct nand_chip board_chip;
static unsigned long baseaddr; static void __iomem *baseaddr;
</programlisting> </programlisting>
</sect1> </sect1>
<sect1 id="Partition_defines"> <sect1 id="Partition_defines">
...@@ -283,8 +283,8 @@ int __init board_init (void) ...@@ -283,8 +283,8 @@ int __init board_init (void)
} }
/* map physical address */ /* map physical address */
baseaddr = (unsigned long)ioremap(CHIP_PHYSICAL_ADDRESS, 1024); baseaddr = ioremap(CHIP_PHYSICAL_ADDRESS, 1024);
if(!baseaddr){ if (!baseaddr) {
printk("Ioremap to access NAND chip failed\n"); printk("Ioremap to access NAND chip failed\n");
err = -EIO; err = -EIO;
goto out_mtd; goto out_mtd;
...@@ -316,7 +316,7 @@ int __init board_init (void) ...@@ -316,7 +316,7 @@ int __init board_init (void)
goto out; goto out;
out_ior: out_ior:
iounmap((void *)baseaddr); iounmap(baseaddr);
out_mtd: out_mtd:
kfree (board_mtd); kfree (board_mtd);
out: out:
...@@ -341,7 +341,7 @@ static void __exit board_cleanup (void) ...@@ -341,7 +341,7 @@ static void __exit board_cleanup (void)
nand_release (board_mtd); nand_release (board_mtd);
/* unmap physical address */ /* unmap physical address */
iounmap((void *)baseaddr); iounmap(baseaddr);
/* Free the MTD device structure */ /* Free the MTD device structure */
kfree (board_mtd); kfree (board_mtd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment