redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

mtd: remove the get_unmapped_area method 

It is now unused.

Signed-off-by: Nicolas Pitre <nico@linaro.org>
Reviewed-by: Richard Weinberger <richard@nod.at>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Tested-by: Chris Brandt <chris.brandt@renesas.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
hifive-unleashed-5.1
Nicolas Pitre 2017-11-07 22:29:48 +01:00 committed by Richard Weinberger
parent 9eaa903c06
commit 9a5941080e
6 changed files with 0 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/mtd/chips/map_ram.c
View File

@ -20,8 +20,6 @@ static int mapram_write (struct mtd_info *, loff_t, size_t, size_t *, const u_ch
static int mapram_erase (struct mtd_info *, struct erase_info *); static int mapram_erase (struct mtd_info *, struct erase_info *);
static void mapram_nop (struct mtd_info *); static void mapram_nop (struct mtd_info *);
static struct mtd_info *map_ram_probe(struct map_info *map); static struct mtd_info *map_ram_probe(struct map_info *map);
static unsigned long mapram_unmapped_area(struct mtd_info *, unsigned long,
unsigned long, unsigned long);
static int mapram_point (struct mtd_info *mtd, loff_t from, size_t len, static int mapram_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);
static int mapram_unpoint(struct mtd_info *mtd, loff_t from, size_t len); static int mapram_unpoint(struct mtd_info *mtd, loff_t from, size_t len);
@ -68,7 +66,6 @@ static struct mtd_info *map_ram_probe(struct map_info *map)
mtd->type = MTD_RAM; mtd->type = MTD_RAM;
mtd->size = map->size; mtd->size = map->size;
mtd->_erase = mapram_erase; mtd->_erase = mapram_erase;
mtd->_get_unmapped_area = mapram_unmapped_area;
mtd->_read = mapram_read; mtd->_read = mapram_read;
mtd->_write = mapram_write; mtd->_write = mapram_write;
mtd->_panic_write = mapram_write; mtd->_panic_write = mapram_write;
@ -86,21 +83,6 @@ static struct mtd_info *map_ram_probe(struct map_info *map)
return mtd; return mtd;
} }
/*
* 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 unsigned long mapram_unmapped_area(struct mtd_info *mtd,
unsigned long len,
unsigned long offset,
unsigned long flags)
{
struct map_info *map = mtd->priv;
return (unsigned long) map->virt + offset;
}
static int mapram_point(struct mtd_info *mtd, loff_t from, size_t len, static int mapram_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)
{ {

17
drivers/mtd/chips/map_rom.c
View File

@ -20,8 +20,6 @@ static int maprom_write (struct mtd_info *, loff_t, size_t, size_t *, const u_ch
static void maprom_nop (struct mtd_info *); static void maprom_nop (struct mtd_info *);
static struct mtd_info *map_rom_probe(struct map_info *map); static struct mtd_info *map_rom_probe(struct map_info *map);
static int maprom_erase (struct mtd_info *mtd, struct erase_info *info); static int maprom_erase (struct mtd_info *mtd, struct erase_info *info);
static unsigned long maprom_unmapped_area(struct mtd_info *, unsigned long,
unsigned long, unsigned long);
static int maprom_point (struct mtd_info *mtd, loff_t from, size_t len, static int maprom_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);
static int maprom_unpoint(struct mtd_info *mtd, loff_t from, size_t len); static int maprom_unpoint(struct mtd_info *mtd, loff_t from, size_t len);
@ -55,7 +53,6 @@ static struct mtd_info *map_rom_probe(struct map_info *map)
mtd->name = map->name; mtd->name = map->name;
mtd->type = MTD_ROM; mtd->type = MTD_ROM;
mtd->size = map->size; mtd->size = map->size;
mtd->_get_unmapped_area = maprom_unmapped_area;
mtd->_point = maprom_point; mtd->_point = maprom_point;
mtd->_unpoint = maprom_unpoint; mtd->_unpoint = maprom_unpoint;
mtd->_read = maprom_read; mtd->_read = maprom_read;
@ -72,20 +69,6 @@ static struct mtd_info *map_rom_probe(struct map_info *map)
} }
/*
* 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 unsigned long maprom_unmapped_area(struct mtd_info *mtd,
unsigned long len,
unsigned long offset,
unsigned long flags)
{
struct map_info *map = mtd->priv;
return (unsigned long) map->virt + offset;
}
static int maprom_point(struct mtd_info *mtd, loff_t from, size_t len, static int maprom_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)
{ {

14
drivers/mtd/devices/mtdram.c
View File

@ -99,19 +99,6 @@ static int ram_unpoint(struct mtd_info *mtd, loff_t from, size_t len)
return 0; return 0;
} }
/*
* 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 unsigned long ram_get_unmapped_area(struct mtd_info *mtd,
unsigned long len,
unsigned long offset,
unsigned long flags)
{
return (unsigned long) mtd->priv + offset;
}
static int ram_read(struct mtd_info *mtd, loff_t from, size_t len, static int ram_read(struct mtd_info *mtd, loff_t from, size_t len,
size_t *retlen, u_char *buf) size_t *retlen, u_char *buf)
{ {
@ -156,7 +143,6 @@ int mtdram_init_device(struct mtd_info *mtd, void *mapped_address,
mtd->_erase = ram_erase; mtd->_erase = ram_erase;
mtd->_point = ram_point; mtd->_point = ram_point;
mtd->_unpoint = ram_unpoint; mtd->_unpoint = ram_unpoint;
mtd->_get_unmapped_area = ram_get_unmapped_area;
mtd->_read = ram_read; mtd->_read = ram_read;
mtd->_write = ram_write; mtd->_write = ram_write;

27
drivers/mtd/mtdconcat.c
View File

@ -643,32 +643,6 @@ static int concat_block_markbad(struct mtd_info *mtd, loff_t ofs)
return err; return err;
} }
/*
* try to support NOMMU mmaps on concatenated devices
* - we don't support subdev spanning as we can't guarantee it'll work
*/
static unsigned long concat_get_unmapped_area(struct mtd_info *mtd,
unsigned long len,
unsigned long offset,
unsigned long flags)
{
struct mtd_concat *concat = CONCAT(mtd);
int i;
for (i = 0; i < concat->num_subdev; i++) {
struct mtd_info *subdev = concat->subdev[i];
if (offset >= subdev->size) {
offset -= subdev->size;
continue;
}
return mtd_get_unmapped_area(subdev, len, offset, flags);
}
return (unsigned long) -ENOSYS;
}
/* /*
* This function constructs a virtual MTD device by concatenating * This function constructs a virtual MTD device by concatenating
* num_devs MTD devices. A pointer to the new device object is * num_devs MTD devices. A pointer to the new device object is
@ -790,7 +764,6 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[], /* subdevices to c
concat->mtd._unlock = concat_unlock; concat->mtd._unlock = concat_unlock;
concat->mtd._suspend = concat_suspend; concat->mtd._suspend = concat_suspend;
concat->mtd._resume = concat_resume; concat->mtd._resume = concat_resume;
concat->mtd._get_unmapped_area = concat_get_unmapped_area;
/* /*
* Combine the erase block size info of the subdevices: * Combine the erase block size info of the subdevices:

14
drivers/mtd/mtdpart.c
View File

@ -101,18 +101,6 @@ static int part_unpoint(struct mtd_info *mtd, loff_t from, size_t len)
return part->parent->_unpoint(part->parent, from + part->offset, len); return part->parent->_unpoint(part->parent, from + part->offset, len);
} }
static unsigned long part_get_unmapped_area(struct mtd_info *mtd,
unsigned long len,
unsigned long offset,
unsigned long flags)
{
struct mtd_part *part = mtd_to_part(mtd);
offset += part->offset;
return part->parent->_get_unmapped_area(part->parent, len, offset,
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,
struct mtd_oob_ops *ops) struct mtd_oob_ops *ops)
{ {
@ -458,8 +446,6 @@ static struct mtd_part *allocate_partition(struct mtd_info *parent,
slave->mtd._unpoint = part_unpoint; slave->mtd._unpoint = part_unpoint;
} }
if (parent->_get_unmapped_area)
slave->mtd._get_unmapped_area = part_get_unmapped_area;
if (parent->_read_oob) if (parent->_read_oob)
slave->mtd._read_oob = part_read_oob; slave->mtd._read_oob = part_read_oob;
if (parent->_write_oob) if (parent->_write_oob)

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

@ -297,10 +297,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);
int (*_unpoint) (struct mtd_info *mtd, loff_t from, size_t len); int (*_unpoint) (struct mtd_info *mtd, loff_t from, size_t len);
unsigned long (*_get_unmapped_area) (struct mtd_info *mtd,
unsigned long len,
unsigned long offset,
unsigned long flags);
int (*_read) (struct mtd_info *mtd, loff_t from, size_t len, int (*_read) (struct mtd_info *mtd, loff_t from, size_t len,
size_t *retlen, u_char *buf); size_t *retlen, u_char *buf);
int (*_write) (struct mtd_info *mtd, loff_t to, size_t len, int (*_write) (struct mtd_info *mtd, loff_t to, size_t len,