Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

H Hartley Sweeten and committed by
Linus Torvalds
8d9f99c3 143724fd

+6 -6
+6 -6
Documentation/DocBook/mtdnand.tmpl
··· 174 174 </para> 175 175 <programlisting> 176 176 static struct mtd_info *board_mtd; 177 - static unsigned long baseaddr; 177 + static void __iomem *baseaddr; 178 178 </programlisting> 179 179 <para> 180 180 Static example ··· 182 182 <programlisting> 183 183 static struct mtd_info board_mtd; 184 184 static struct nand_chip board_chip; 185 - static unsigned long baseaddr; 185 + static void __iomem *baseaddr; 186 186 </programlisting> 187 187 </sect1> 188 188 <sect1 id="Partition_defines"> ··· 283 283 } 284 284 285 285 /* map physical address */ 286 - baseaddr = (unsigned long)ioremap(CHIP_PHYSICAL_ADDRESS, 1024); 287 - if(!baseaddr){ 286 + baseaddr = ioremap(CHIP_PHYSICAL_ADDRESS, 1024); 287 + if (!baseaddr) { 288 288 printk("Ioremap to access NAND chip failed\n"); 289 289 err = -EIO; 290 290 goto out_mtd; ··· 316 316 goto out; 317 317 318 318 out_ior: 319 - iounmap((void *)baseaddr); 319 + iounmap(baseaddr); 320 320 out_mtd: 321 321 kfree (board_mtd); 322 322 out: ··· 341 341 nand_release (board_mtd); 342 342 343 343 /* unmap physical address */ 344 - iounmap((void *)baseaddr); 344 + iounmap(baseaddr); 345 345 346 346 /* Free the MTD device structure */ 347 347 kfree (board_mtd);