Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Documentation/DocBook/mtdnand.tmpl

+6 −6
Original line number Diff line number Diff line
@@ -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,7 +283,7 @@ int __init board_init (void) 
	}



	/* map physical address */

	baseaddr = (unsigned long)ioremap(CHIP_PHYSICAL_ADDRESS, 1024);

	baseaddr = ioremap(CHIP_PHYSICAL_ADDRESS, 1024);

	if (!baseaddr) {

		printk("Ioremap to access NAND chip failed\n");

		err = -EIO;
@@ -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);