lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mtd: introduce mtd_get_unmapped_area interface

Browse Source 
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Artem Bityutskiy
2011-12-23 17:10:15 +02:00
committed by David Woodhouse
parent 7219778ad9
commit 04c601bfa4
5 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mtd/mtdchar.c
View File

@@ -1135,7 +1135,7 @@ static unsigned long mtdchar_get_unmapped_area(struct file *file,
if (offset > mtd->size - len) if (offset > mtd->size - len)
return (unsigned long) -EINVAL; return (unsigned long) -EINVAL;
return mtd->get_unmapped_area(mtd, len, offset, flags); return mtd_get_unmapped_area(mtd, len, offset, flags);
} }
/* can't map directly */ /* can't map directly */

4
drivers/mtd/mtdconcat.c
View File

@@ -726,8 +726,8 @@ static unsigned long concat_get_unmapped_area(struct mtd_info *mtd,
return (unsigned long) -EINVAL; return (unsigned long) -EINVAL;
if (subdev->get_unmapped_area) if (subdev->get_unmapped_area)
return subdev->get_unmapped_area(subdev, len, offset, return mtd_get_unmapped_area(subdev, len, offset,
flags); flags);
break; break;
} }

3
drivers/mtd/mtdpart.c
View File

@@ -108,8 +108,7 @@ static unsigned long part_get_unmapped_area(struct mtd_info *mtd,
struct mtd_part *part = PART(mtd); struct mtd_part *part = PART(mtd);
offset += part->offset; offset += part->offset;
return part->master->get_unmapped_area(part->master, len, offset, return mtd_get_unmapped_area(part->master, len, offset, flags);
flags);
} }
static int part_read_oob(struct mtd_info *mtd, loff_t from, static int part_read_oob(struct mtd_info *mtd, loff_t from,

2
fs/romfs/mmap-nommu.c
View File

@@ -53,7 +53,7 @@ static unsigned long romfs_get_unmapped_area(struct file *file,
if (offset > mtd->size - len) if (offset > mtd->size - len)
return (unsigned long) -EINVAL; return (unsigned long) -EINVAL;
return mtd->get_unmapped_area(mtd, len, offset, flags); return mtd_get_unmapped_area(mtd, len, offset, flags);
} }
cant_map_directly: cant_map_directly:

18
include/linux/mtd/mtd.h
View File

@@ -178,11 +178,6 @@ struct mtd_info {
int (*point) (struct mtd_info *mtd, loff_t from, size_t len, int (*point) (struct mtd_info *mtd, loff_t from, size_t len,
size_t *retlen, void **virt, resource_size_t *phys); size_t *retlen, void **virt, resource_size_t *phys);
void (*unpoint) (struct mtd_info *mtd, loff_t from, size_t len); void (*unpoint) (struct mtd_info *mtd, loff_t from, size_t len);
/* Allow NOMMU mmap() to directly map the device (if not NULL)
* - return the address to which the offset maps
* - return -ENOSYS to indicate refusal to do the mapping
*/
unsigned long (*get_unmapped_area) (struct mtd_info *mtd, unsigned long (*get_unmapped_area) (struct mtd_info *mtd,
unsigned long len, unsigned long len,
unsigned long offset, unsigned long offset,
@@ -293,6 +288,19 @@ static inline void mtd_unpoint(struct mtd_info *mtd, loff_t from, size_t len)
return mtd->unpoint(mtd, from, len); return mtd->unpoint(mtd, from, len);
} }
/*
* Allow NOMMU mmap() to directly map the device (if not NULL)
* - return the address to which the offset maps
* - return -ENOSYS to indicate refusal to do the mapping
*/
static inline unsigned long mtd_get_unmapped_area(struct mtd_info *mtd,
unsigned long len,
unsigned long offset,
unsigned long flags)
{
return mtd->get_unmapped_area(mtd, len, offset, flags);
}
static inline struct mtd_info *dev_to_mtd(struct device *dev) static inline struct mtd_info *dev_to_mtd(struct device *dev)
{ {
return dev ? dev_get_drvdata(dev) : NULL; return dev ? dev_get_drvdata(dev) : NULL;