Skip to content

Commit

Permalink
mtd: remove R/O checking duplication
Browse files Browse the repository at this point in the history 
Many drivers check whether the partition is R/O and return -EROFS if yes.
Let's stop having duplicated checks and move them to the API functions
instead.

And again a bit of noise - deleted few too sparse newlines, sorry.

Signed-off-by: Artem Bityutskiy <[email protected]>
Signed-off-by: David Woodhouse <[email protected]>
  • Loading branch information
@dedekind
dedekind authored and David Woodhouse committed Mar 26, 2012
1 parent 5def489 commit 664addc
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 54 deletions.
4 changes: 0 additions & 4 deletions drivers/mtd/chips/map_ram.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,10 @@ static int mapram_erase (struct mtd_info *mtd, struct erase_info *instr)
unsigned long i;

allff = map_word_ff(map);

for (i=0; i<instr->len; i += map_bankwidth(map))
map_write(map, allff, instr->addr + i);

instr->state = MTD_ERASE_DONE;

mtd_erase_callback(instr);

return 0;
}

Expand Down
3 changes: 1 addition & 2 deletions drivers/mtd/chips/map_rom.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,7 @@ static void maprom_nop(struct mtd_info *mtd)

static int maprom_write (struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf)
{
printk(KERN_NOTICE "maprom_write called\n");
return -EIO;
return -EROFS;
}

static int maprom_erase (struct mtd_info *mtd, struct erase_info *info)
Expand Down
1 change: 0 additions & 1 deletion drivers/mtd/devices/phram.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ struct phram_mtd_list {

static LIST_HEAD(phram_list);


static int phram_erase(struct mtd_info *mtd, struct erase_info *instr)
{
u_char *start = mtd->priv;
Expand Down
27 changes: 3 additions & 24 deletions drivers/mtd/mtdconcat.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,6 @@ concat_write(struct mtd_info *mtd, loff_t to, size_t len,
int err = -EINVAL;
int i;

if (!(mtd->flags & MTD_WRITEABLE))
return -EROFS;

*retlen = 0;

for (i = 0; i < concat->num_subdev; i++) {
Expand All @@ -145,11 +142,7 @@ concat_write(struct mtd_info *mtd, loff_t to, size_t len,
else
size = len;

if (!(subdev->flags & MTD_WRITEABLE))
err = -EROFS;
else
err = mtd_write(subdev, to, size, &retsize, buf);

err = mtd_write(subdev, to, size, &retsize, buf);
if (err)
break;

Expand All @@ -176,9 +169,6 @@ concat_writev(struct mtd_info *mtd, const struct kvec *vecs,
int i;
int err = -EINVAL;

if (!(mtd->flags & MTD_WRITEABLE))
return -EROFS;

*retlen = 0;

/* Calculate total length of data */
Expand Down Expand Up @@ -220,12 +210,8 @@ concat_writev(struct mtd_info *mtd, const struct kvec *vecs,
old_iov_len = vecs_copy[entry_high].iov_len;
vecs_copy[entry_high].iov_len = size;

if (!(subdev->flags & MTD_WRITEABLE))
err = -EROFS;
else
err = mtd_writev(subdev, &vecs_copy[entry_low],
entry_high - entry_low + 1, to,
&retsize);
err = mtd_writev(subdev, &vecs_copy[entry_low],
entry_high - entry_low + 1, to, &retsize);

vecs_copy[entry_high].iov_len = old_iov_len - size;
vecs_copy[entry_high].iov_base += size;
Expand Down Expand Up @@ -399,9 +385,6 @@ static int concat_erase(struct mtd_info *mtd, struct erase_info *instr)
uint64_t length, offset = 0;
struct erase_info *erase;

if (!(mtd->flags & MTD_WRITEABLE))
return -EROFS;

/*
* Check for proper erase block alignment of the to-be-erased area.
* It is easier to do this based on the super device's erase
Expand Down Expand Up @@ -489,10 +472,6 @@ static int concat_erase(struct mtd_info *mtd, struct erase_info *instr)
else
erase->len = length;

if (!(subdev->flags & MTD_WRITEABLE)) {
err = -EROFS;
break;
}
length -= erase->len;
if ((err = concat_dev_erase(subdev, erase))) {
/* sanity check: should never happen since
Expand Down
12 changes: 10 additions & 2 deletions drivers/mtd/mtdcore.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,8 @@ int mtd_erase(struct mtd_info *mtd, struct erase_info *instr)
{
if (instr->addr > mtd->size || instr->len > mtd->size - instr->addr)
return -EINVAL;
if (!(mtd->flags & MTD_WRITEABLE))
return -EROFS;
return mtd->_erase(mtd, instr);
}
EXPORT_SYMBOL_GPL(mtd_erase);
Expand Down Expand Up @@ -752,10 +754,10 @@ int mtd_write(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen,
const u_char *buf)
{
*retlen = 0;
if (!mtd->_write)
return -EROFS;
if (to < 0 || to > mtd->size || len > mtd->size - to)
return -EINVAL;
if (!mtd->_write || !(mtd->flags & MTD_WRITEABLE))
return -EROFS;
return mtd->_write(mtd, to, len, retlen, buf);
}
EXPORT_SYMBOL_GPL(mtd_write);
Expand All @@ -775,6 +777,8 @@ int mtd_panic_write(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen,
return -EOPNOTSUPP;
if (to < 0 || to > mtd->size || len > mtd->size - to)
return -EINVAL;
if (!(mtd->flags & MTD_WRITEABLE))
return -EROFS;
return mtd->_panic_write(mtd, to, len, retlen, buf);
}
EXPORT_SYMBOL_GPL(mtd_panic_write);
Expand Down Expand Up @@ -826,6 +830,8 @@ int mtd_block_markbad(struct mtd_info *mtd, loff_t ofs)
return -EOPNOTSUPP;
if (ofs < 0 || ofs > mtd->size)
return -EINVAL;
if (!(mtd->flags & MTD_WRITEABLE))
return -EROFS;
return mtd->_block_markbad(mtd, ofs);
}
EXPORT_SYMBOL_GPL(mtd_block_markbad);
Expand Down Expand Up @@ -877,6 +883,8 @@ int mtd_writev(struct mtd_info *mtd, const struct kvec *vecs,
unsigned long count, loff_t to, size_t *retlen)
{
*retlen = 0;
if (!(mtd->flags & MTD_WRITEABLE))
return -EROFS;
if (!mtd->_writev)
return default_mtd_writev(mtd, vecs, count, to, retlen);
return mtd->_writev(mtd, vecs, count, to, retlen);
Expand Down
14 changes: 1 addition & 13 deletions drivers/mtd/mtdpart.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,17 +172,13 @@ static int part_write(struct mtd_info *mtd, loff_t to, size_t len,
size_t *retlen, const u_char *buf)
{
struct mtd_part *part = PART(mtd);
if (!(mtd->flags & MTD_WRITEABLE))
return -EROFS;
return mtd_write(part->master, to + part->offset, len, retlen, buf);
}

static int part_panic_write(struct mtd_info *mtd, loff_t to, size_t len,
size_t *retlen, const u_char *buf)
{
struct mtd_part *part = PART(mtd);
if (!(mtd->flags & MTD_WRITEABLE))
return -EROFS;
return mtd_panic_write(part->master, to + part->offset, len, retlen,
buf);
}
Expand All @@ -192,9 +188,6 @@ static int part_write_oob(struct mtd_info *mtd, loff_t to,
{
struct mtd_part *part = PART(mtd);

if (!(mtd->flags & MTD_WRITEABLE))
return -EROFS;

if (to >= mtd->size)
return -EINVAL;
if (ops->datbuf && to + ops->len > mtd->size)
Expand All @@ -220,8 +213,6 @@ static int part_writev(struct mtd_info *mtd, const struct kvec *vecs,
unsigned long count, loff_t to, size_t *retlen)
{
struct mtd_part *part = PART(mtd);
if (!(mtd->flags & MTD_WRITEABLE))
return -EROFS;
return mtd_writev(part->master, vecs, count, to + part->offset,
retlen);
}
Expand All @@ -230,8 +221,7 @@ static int part_erase(struct mtd_info *mtd, struct erase_info *instr)
{
struct mtd_part *part = PART(mtd);
int ret;
if (!(mtd->flags & MTD_WRITEABLE))
return -EROFS;

instr->addr += part->offset;
ret = mtd_erase(part->master, instr);
if (ret) {
Expand Down Expand Up @@ -304,8 +294,6 @@ static int part_block_markbad(struct mtd_info *mtd, loff_t ofs)
struct mtd_part *part = PART(mtd);
int res;

if (!(mtd->flags & MTD_WRITEABLE))
return -EROFS;
ofs += part->offset;
res = mtd_block_markbad(part->master, ofs);
if (!res)
Expand Down
8 changes: 0 additions & 8 deletions drivers/mtd/ubi/gluebi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,6 @@ static int gluebi_write(struct mtd_info *mtd, loff_t to, size_t len,
struct gluebi_device *gluebi;

gluebi = container_of(mtd, struct gluebi_device, mtd);

if (!(mtd->flags & MTD_WRITEABLE))
return -EROFS;

lnum = div_u64_rem(to, mtd->erasesize, &offs);

if (len % mtd->writesize || offs % mtd->writesize)
Expand Down Expand Up @@ -263,12 +259,8 @@ static int gluebi_erase(struct mtd_info *mtd, struct erase_info *instr)

lnum = mtd_div_by_eb(instr->addr, mtd);
count = mtd_div_by_eb(instr->len, mtd);

gluebi = container_of(mtd, struct gluebi_device, mtd);

if (!(mtd->flags & MTD_WRITEABLE))
return -EROFS;

for (i = 0; i < count - 1; i++) {
err = ubi_leb_unmap(gluebi->desc, lnum + i);
if (err)
Expand Down
2 changes: 2 additions & 0 deletions include/linux/mtd/mtd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,8 @@ static inline int mtd_write_oob(struct mtd_info *mtd, loff_t to,
ops->retlen = ops->oobretlen = 0;
if (!mtd->_write_oob)
return -EOPNOTSUPP;
if (!(mtd->flags & MTD_WRITEABLE))
return -EROFS;
return mtd->_write_oob(mtd, to, ops);
}

Expand Down

0 comments on commit 664addc

Please sign in to comment.