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

Commit 3e04767a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/mtd-2.6 

* git://git.infradead.org/mtd-2.6:
  [MTD] Cleanup of 'ioremap balanced with iounmap for drivers/mtd subsystem'
  [MTD] fix nftl_write warning
  [MTD] fix printk warning
  [MTD ONENAND] Check OneNAND lock scheme & all block unlock command support
  [MTD ONENAND] Remove unused MTD_ONENAND_SYNC_READ configuration
  [MTD ONENAND] Fix OneNAND probe
  [MTD NAND] Provide prototype for newly-exported nand_wait_ready()
  [MTD] Remove #ifndef __KERNEL__ hack in <mtd/mtd-abi.h>
  [MTD NAND] Allow override of page read and write functions.
  [MTD NAND] Allocate chip->buffers separately to allow it to be overridden
  [MTD NAND] Split nand_scan() into two parts; allow board driver to intervene
  [MTD NAND] Export nand_wait_ready() for use by board drivers
parents a12f66fc 76a5027c

drivers/mtd/maps/arctic-mtd.c

+3 −3
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static struct mtd_partition arctic_partitions[PARTITIONS] = { 
static int __init

init_arctic_mtd(void)

{

	int err = 0;

	int err;



	printk("%s: 0x%08x at 0x%08x\n", NAME, SIZE, PADDR);
@@ -112,7 +112,7 @@ init_arctic_mtd(void) 
	arctic_mtd = do_map_probe("cfi_probe", &arctic_mtd_map);



	if (!arctic_mtd) {

		iounmap((void *) arctic_mtd_map.virt);

		iounmap(arctic_mtd_map.virt);

		return -ENXIO;

	}
@@ -121,7 +121,7 @@ init_arctic_mtd(void) 
	err = add_mtd_partitions(arctic_mtd, arctic_partitions, PARTITIONS);

	if (err) {

		printk("%s: add_mtd_partitions failed\n", NAME);

		iounmap((void *) arctic_mtd_map.virt);

		iounmap(arctic_mtd_map.virt);

	}



	return err;

drivers/mtd/maps/beech-mtd.c

+3 −3
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static struct mtd_partition beech_partitions[2] = { 
static int __init

init_beech_mtd(void)

{

	int err = 0;

	int err;



	printk("%s: 0x%08x at 0x%08x\n", NAME, SIZE, PADDR);
@@ -89,7 +89,7 @@ init_beech_mtd(void) 
	beech_mtd = do_map_probe("cfi_probe", &beech_mtd_map);



	if (!beech_mtd) {

		iounmap((void *) beech_mtd_map.virt);

		iounmap(beech_mtd_map.virt);

		return -ENXIO;

	}
@@ -98,7 +98,7 @@ init_beech_mtd(void) 
	err = add_mtd_partitions(beech_mtd, beech_partitions, 2);

	if (err) {

		printk("%s: add_mtd_partitions failed\n", NAME);

		iounmap((void *) beech_mtd_map.virt);

		iounmap(beech_mtd_map.virt);

	}



	return err;

drivers/mtd/maps/cstm_mips_ixx.c

+4 −4
Original line number Diff line number Diff line
@@ -175,8 +175,8 @@ int __init init_cstm_mips_ixx(void) 
			printk(KERN_WARNING "Failed to ioremap\n");

			for (j = 0; j < i; j++) {

				if (cstm_mips_ixx_map[j].virt) {

					iounmap((void *)cstm_mips_ixx_map[j].virt);

					cstm_mips_ixx_map[j].virt = 0;

					iounmap(cstm_mips_ixx_map[j].virt);

					cstm_mips_ixx_map[j].virt = NULL;

				}

			}

			return -EIO;
@@ -214,8 +214,8 @@ int __init init_cstm_mips_ixx(void) 
		else {

			for (i = 0; i < PHYSMAP_NUMBER; i++) {

				if (cstm_mips_ixx_map[i].virt) {

					iounmap((void *)cstm_mips_ixx_map[i].virt);

					cstm_mips_ixx_map[i].virt = 0;

					iounmap(cstm_mips_ixx_map[i].virt);

					cstm_mips_ixx_map[i].virt = NULL;

				}

			}

			return -ENXIO;

drivers/mtd/maps/nettel.c

+1 −1
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ int __init nettel_init(void) 


#ifdef CONFIG_MTD_CFI_INTELEXT

out_unmap1:

	iounmap((void *) nettel_intel_map.virt);

	iounmap(nettel_intel_map.virt);

#endif



out_unmap2:

drivers/mtd/maps/redwood.c

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static struct mtd_info *redwood_mtd; 


int __init init_redwood_flash(void)

{

	int err = 0;

	int err;



	printk(KERN_NOTICE "redwood: flash mapping: %x at %x\n",

			WINDOW_SIZE, WINDOW_ADDR);