Commit 2c4aabcc 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][NOR] Add physical address to point() method
  [JFFS2] Track parent inode for directories (for NFS export)
  [JFFS2] Invert last argument of jffs2_gc_fetch_inode(), make it boolean.
  [JFFS2] Quiet lockdep false positive.
  [JFFS2] Clean up jffs2_alloc_inode() and jffs2_i_init_once()
  [MTD] Delete long-unused jedec.h header file.
  [MTD] [NAND] at91_nand: use at91_nand_{en,dis}able consistently.
parents bcf35afb a98889f3

drivers/mtd/chips/cfi_cmdset_0001.c

+8 −6
Original line number Diff line number Diff line
@@ -82,9 +82,8 @@ static struct mtd_info *cfi_intelext_setup (struct mtd_info *); 
static int cfi_intelext_partition_fixup(struct mtd_info *, struct cfi_private **);



static int cfi_intelext_point (struct mtd_info *mtd, loff_t from, size_t len,

		     size_t *retlen, u_char **mtdbuf);

static void cfi_intelext_unpoint (struct mtd_info *mtd, u_char *addr, loff_t from,

			size_t len);

		     size_t *retlen, void **virt, resource_size_t *phys);

static void cfi_intelext_unpoint(struct mtd_info *mtd, loff_t from, size_t len);



static int chip_ready (struct map_info *map, struct flchip *chip, unsigned long adr, int mode);

static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr, int mode);
@@ -1240,7 +1239,8 @@ static int do_point_onechip (struct map_info *map, struct flchip *chip, loff_t a 
	return ret;

}



static int cfi_intelext_point (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char **mtdbuf)

static int cfi_intelext_point(struct mtd_info *mtd, loff_t from, size_t len,

		size_t *retlen, void **virt, resource_size_t *phys)

{

	struct map_info *map = mtd->priv;

	struct cfi_private *cfi = map->fldrv_priv;
@@ -1257,8 +1257,10 @@ static int cfi_intelext_point (struct mtd_info *mtd, loff_t from, size_t len, si 
	chipnum = (from >> cfi->chipshift);

	ofs = from - (chipnum << cfi->chipshift);



	*mtdbuf = (void *)map->virt + cfi->chips[chipnum].start + ofs;

	*virt = map->virt + cfi->chips[chipnum].start + ofs;

	*retlen = 0;

	if (phys)

		*phys = map->phys + cfi->chips[chipnum].start + ofs;



	while (len) {

		unsigned long thislen;
@@ -1291,7 +1293,7 @@ static int cfi_intelext_point (struct mtd_info *mtd, loff_t from, size_t len, si 
	return 0;

}



static void cfi_intelext_unpoint (struct mtd_info *mtd, u_char *addr, loff_t from, size_t len)

static void cfi_intelext_unpoint(struct mtd_info *mtd, loff_t from, size_t len)

{

	struct map_info *map = mtd->priv;

	struct cfi_private *cfi = map->fldrv_priv;

drivers/mtd/devices/mtdram.c

+7 −4
Original line number Diff line number Diff line
@@ -48,18 +48,21 @@ static int ram_erase(struct mtd_info *mtd, struct erase_info *instr) 
}



static int ram_point(struct mtd_info *mtd, loff_t from, size_t len,

		size_t *retlen, u_char **mtdbuf)

		size_t *retlen, void **virt, resource_size_t *phys)

{

	if (from + len > mtd->size)

		return -EINVAL;



	*mtdbuf = mtd->priv + from;

	/* can we return a physical address with this driver? */

	if (phys)

		return -EINVAL;



	*virt = mtd->priv + from;

	*retlen = len;

	return 0;

}



static void ram_unpoint(struct mtd_info *mtd, u_char * addr, loff_t from,

		size_t len)

static void ram_unpoint(struct mtd_info *mtd, loff_t from, size_t len)

{

}

drivers/mtd/devices/phram.c

+7 −6
Original line number Diff line number Diff line
@@ -57,20 +57,21 @@ static int phram_erase(struct mtd_info *mtd, struct erase_info *instr) 
}



static int phram_point(struct mtd_info *mtd, loff_t from, size_t len,

		size_t *retlen, u_char **mtdbuf)

		size_t *retlen, void **virt, resource_size_t *phys)

{

	u_char *start = mtd->priv;



	if (from + len > mtd->size)

		return -EINVAL;



	*mtdbuf = start + from;

	/* can we return a physical address with this driver? */

	if (phys)

		return -EINVAL;



	*virt = mtd->priv + from;

	*retlen = len;

	return 0;

}



static void phram_unpoint(struct mtd_info *mtd, u_char *addr, loff_t from,

		size_t len)

static void phram_unpoint(struct mtd_info *mtd, loff_t from, size_t len)

{

}

drivers/mtd/devices/pmc551.c

+17 −10
Original line number Diff line number Diff line
@@ -134,7 +134,8 @@ static int pmc551_erase(struct mtd_info *mtd, struct erase_info *instr) 
	eoff_lo = end & (priv->asize - 1);

	soff_lo = instr->addr & (priv->asize - 1);



	pmc551_point(mtd, instr->addr, instr->len, &retlen, &ptr);

	pmc551_point(mtd, instr->addr, instr->len, &retlen,

		     (void **)&ptr, NULL);



	if (soff_hi == eoff_hi || mtd->size == priv->asize) {

		/* The whole thing fits within one access, so just one shot
@@ -154,7 +155,8 @@ static int pmc551_erase(struct mtd_info *mtd, struct erase_info *instr) 
			}

			soff_hi += priv->asize;

			pmc551_point(mtd, (priv->base_map0 | soff_hi),

				     priv->asize, &retlen, &ptr);

				     priv->asize, &retlen,

				     (void **)&ptr, NULL);

		}

		memset(ptr, 0xff, eoff_lo);

	}
@@ -170,7 +172,7 @@ static int pmc551_erase(struct mtd_info *mtd, struct erase_info *instr) 
}



static int pmc551_point(struct mtd_info *mtd, loff_t from, size_t len,

			size_t * retlen, u_char ** mtdbuf)

			size_t *retlen, void **virt, resource_size_t *phys)

{

	struct mypriv *priv = mtd->priv;

	u32 soff_hi;
@@ -188,6 +190,10 @@ static int pmc551_point(struct mtd_info *mtd, loff_t from, size_t len, 
		return -EINVAL;

	}



	/* can we return a physical address with this driver? */

	if (phys)

		return -EINVAL;



	soff_hi = from & ~(priv->asize - 1);

	soff_lo = from & (priv->asize - 1);
@@ -198,13 +204,12 @@ static int pmc551_point(struct mtd_info *mtd, loff_t from, size_t len, 
		priv->curr_map0 = soff_hi;

	}



	*mtdbuf = priv->start + soff_lo;

	*virt = priv->start + soff_lo;

	*retlen = len;

	return 0;

}



static void pmc551_unpoint(struct mtd_info *mtd, u_char * addr, loff_t from,

			   size_t len)

static void pmc551_unpoint(struct mtd_info *mtd, loff_t from, size_t len)

{

#ifdef CONFIG_MTD_PMC551_DEBUG

	printk(KERN_DEBUG "pmc551_unpoint()\n");
@@ -242,7 +247,7 @@ static int pmc551_read(struct mtd_info *mtd, loff_t from, size_t len, 
	soff_lo = from & (priv->asize - 1);

	eoff_lo = end & (priv->asize - 1);



	pmc551_point(mtd, from, len, retlen, &ptr);

	pmc551_point(mtd, from, len, retlen, (void **)&ptr, NULL);



	if (soff_hi == eoff_hi) {

		/* The whole thing fits within one access, so just one shot
@@ -263,7 +268,8 @@ static int pmc551_read(struct mtd_info *mtd, loff_t from, size_t len, 
				goto out;

			}

			soff_hi += priv->asize;

			pmc551_point(mtd, soff_hi, priv->asize, retlen, &ptr);

			pmc551_point(mtd, soff_hi, priv->asize, retlen,

				     (void **)&ptr, NULL);

		}

		memcpy(copyto, ptr, eoff_lo);

		copyto += eoff_lo;
@@ -308,7 +314,7 @@ static int pmc551_write(struct mtd_info *mtd, loff_t to, size_t len, 
	soff_lo = to & (priv->asize - 1);

	eoff_lo = end & (priv->asize - 1);



	pmc551_point(mtd, to, len, retlen, &ptr);

	pmc551_point(mtd, to, len, retlen, (void **)&ptr, NULL);



	if (soff_hi == eoff_hi) {

		/* The whole thing fits within one access, so just one shot
@@ -329,7 +335,8 @@ static int pmc551_write(struct mtd_info *mtd, loff_t to, size_t len, 
				goto out;

			}

			soff_hi += priv->asize;

			pmc551_point(mtd, soff_hi, priv->asize, retlen, &ptr);

			pmc551_point(mtd, soff_hi, priv->asize, retlen,

				     (void **)&ptr, NULL);

		}

		memcpy(ptr, copyfrom, eoff_lo);

		copyfrom += eoff_lo;

drivers/mtd/devices/slram.c

+10 −5
Original line number Diff line number Diff line
@@ -76,8 +76,9 @@ static char *map; 
static slram_mtd_list_t *slram_mtdlist = NULL;



static int slram_erase(struct mtd_info *, struct erase_info *);

static int slram_point(struct mtd_info *, loff_t, size_t, size_t *, u_char **);

static void slram_unpoint(struct mtd_info *, u_char *, loff_t,	size_t);

static int slram_point(struct mtd_info *, loff_t, size_t, size_t *, void **,

		resource_size_t *);

static void slram_unpoint(struct mtd_info *, loff_t, size_t);

static int slram_read(struct mtd_info *, loff_t, size_t, size_t *, u_char *);

static int slram_write(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
@@ -104,19 +105,23 @@ static int slram_erase(struct mtd_info *mtd, struct erase_info *instr) 
}



static int slram_point(struct mtd_info *mtd, loff_t from, size_t len,

		size_t *retlen, u_char **mtdbuf)

		size_t *retlen, void **virt, resource_size_t *phys)

{

	slram_priv_t *priv = mtd->priv;



	/* can we return a physical address with this driver? */

	if (phys)

		return -EINVAL;



	if (from + len > mtd->size)

		return -EINVAL;



	*mtdbuf = priv->start + from;

	*virt = priv->start + from;

	*retlen = len;

	return(0);

}



static void slram_unpoint(struct mtd_info *mtd, u_char *addr, loff_t from, size_t len)

static void slram_unpoint(struct mtd_info *mtd, loff_t from, size_t len)

{

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE