projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
[cascardo/linux.git]
/
Documentation
/
DocBook
/
mtdnand.tmpl
diff --git
a/Documentation/DocBook/mtdnand.tmpl
b/Documentation/DocBook/mtdnand.tmpl
index
f508a8a
..
5e7d84b
100644
(file)
--- a/
Documentation/DocBook/mtdnand.tmpl
+++ b/
Documentation/DocBook/mtdnand.tmpl
@@
-174,7
+174,7
@@
</para>
<programlisting>
static struct mtd_info *board_mtd;
</para>
<programlisting>
static struct mtd_info *board_mtd;
-static
unsigned long
baseaddr;
+static
void __iomem *
baseaddr;
</programlisting>
<para>
Static example
</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;
<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">
</programlisting>
</sect1>
<sect1 id="Partition_defines">
@@
-283,8
+283,8
@@
int __init board_init (void)
}
/* map physical address */
}
/* 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;
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:
goto out;
out_ior:
- iounmap(
(void *)
baseaddr);
+ iounmap(baseaddr);
out_mtd:
kfree (board_mtd);
out:
out_mtd:
kfree (board_mtd);
out:
@@
-341,7
+341,7
@@
static void __exit board_cleanup (void)
nand_release (board_mtd);
/* unmap physical address */
nand_release (board_mtd);
/* unmap physical address */
- iounmap(
(void *)
baseaddr);
+ iounmap(baseaddr);
/* Free the MTD device structure */
kfree (board_mtd);
/* Free the MTD device structure */
kfree (board_mtd);