diff options
| author | Andrey Smirnov <andrew.smirnov@gmail.com> | 2019-01-28 22:55:40 -0800 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-02-04 15:30:11 +0100 |
| commit | 0b80e3dae75c32e5f30bf4d9052d4f390cc0bb6e (patch) | |
| tree | ab214800c21830022497a60925741850e9bcd1c8 /drivers/mtd | |
| parent | 5c9408572406c8718a35931ecf74a5cf38632914 (diff) | |
| download | barebox-0b80e3dae75c32e5f30bf4d9052d4f390cc0bb6e.tar.gz barebox-0b80e3dae75c32e5f30bf4d9052d4f390cc0bb6e.tar.xz | |
fs: devfs: Change .lseek callbacks to return 'int'
Returning requested offset from .lseek() callback doesn't really give
us any new information while bringing unnecessary
complications. Change all .lseek() types (both in struct struct
cdev_operations and in struct fs_driver_d) to return 'int' and adjust
the rest of the codebase accordingly.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/nand-bb.c | 7 | ||||
| -rw-r--r-- | drivers/mtd/ubi/barebox.c | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/drivers/mtd/nand/nand-bb.c b/drivers/mtd/nand/nand-bb.c index 012163ebb2..e578d72a49 100644 --- a/drivers/mtd/nand/nand-bb.c +++ b/drivers/mtd/nand/nand-bb.c @@ -236,17 +236,16 @@ static int nand_bb_calc_size(struct nand_bb *bb) return 0; } -static loff_t nand_bb_lseek(struct cdev *cdev, loff_t __offset) +static int nand_bb_lseek(struct cdev *cdev, loff_t offset) { struct nand_bb *bb = cdev->priv; loff_t raw_pos = 0; - uint32_t offset = __offset; /* lseek only in readonly mode */ if (bb->flags & O_ACCMODE) return -ENOSYS; while (raw_pos < bb->mtd->size) { - off_t now = min(offset, bb->mtd->erasesize); + off_t now = min_t(loff_t, offset, bb->mtd->erasesize); if (mtd_block_isbad(bb->mtd, raw_pos)) { raw_pos += bb->mtd->erasesize; @@ -257,7 +256,7 @@ static loff_t nand_bb_lseek(struct cdev *cdev, loff_t __offset) if (!offset) { bb->offset = raw_pos; - return __offset; + return 0; } } diff --git a/drivers/mtd/ubi/barebox.c b/drivers/mtd/ubi/barebox.c index 65f5456455..781061d9a7 100644 --- a/drivers/mtd/ubi/barebox.c +++ b/drivers/mtd/ubi/barebox.c @@ -151,7 +151,7 @@ static int ubi_volume_cdev_close(struct cdev *cdev) return 0; } -static loff_t ubi_volume_cdev_lseek(struct cdev *cdev, loff_t ofs) +static int ubi_volume_cdev_lseek(struct cdev *cdev, loff_t ofs) { struct ubi_volume_cdev_priv *priv = cdev->priv; @@ -159,7 +159,7 @@ static loff_t ubi_volume_cdev_lseek(struct cdev *cdev, loff_t ofs) if (priv->written) return -EINVAL; - return ofs; + return 0; } static int ubi_volume_cdev_truncate(struct cdev *cdev, size_t size) |