diff options
| -rw-r--r-- | drivers/mtd/mtdconcat.c | 4 | ||||
| -rw-r--r-- | drivers/mtd/nand/raw/nand_base.c | 4 | ||||
| -rw-r--r-- | drivers/mtd/nor/cfi_flash.c | 4 | ||||
| -rw-r--r-- | drivers/mtd/partition.c | 4 | ||||
| -rw-r--r-- | drivers/mtd/spi-nor/spi-nor.c | 4 | ||||
| -rw-r--r-- | drivers/net/e1000/mtd.c | 4 | ||||
| -rw-r--r-- | include/linux/mtd/mtd.h | 4 |
7 files changed, 14 insertions, 14 deletions
diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c index 964b00166a..d4f0227384 100644 --- a/drivers/mtd/mtdconcat.c +++ b/drivers/mtd/mtdconcat.c @@ -382,7 +382,7 @@ static int concat_erase(struct mtd_info *mtd, struct erase_info *instr) return 0; } -static int concat_lock(struct mtd_info *mtd, loff_t ofs, size_t len) +static int concat_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len) { struct mtd_concat *concat = CONCAT(mtd); int i, err = -EINVAL; @@ -416,7 +416,7 @@ static int concat_lock(struct mtd_info *mtd, loff_t ofs, size_t len) return err; } -static int concat_unlock(struct mtd_info *mtd, loff_t ofs, size_t len) +static int concat_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len) { struct mtd_concat *concat = CONCAT(mtd); int i, err = 0; diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index 2599e8c8c2..439c3f72d2 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -4449,7 +4449,7 @@ static int nand_block_markgood(struct mtd_info *mtd, loff_t ofs) * @ofs: offset byte address * @len: number of bytes to lock (must be a multiple of block/page size) */ -static int nand_lock(struct mtd_info *mtd, loff_t ofs, size_t len) +static int nand_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len) { struct nand_chip *chip = mtd_to_nand(mtd); @@ -4465,7 +4465,7 @@ static int nand_lock(struct mtd_info *mtd, loff_t ofs, size_t len) * @ofs: offset byte address * @len: number of bytes to unlock (must be a multiple of block/page size) */ -static int nand_unlock(struct mtd_info *mtd, loff_t ofs, size_t len) +static int nand_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len) { struct nand_chip *chip = mtd_to_nand(mtd); diff --git a/drivers/mtd/nor/cfi_flash.c b/drivers/mtd/nor/cfi_flash.c index ac46575004..2cb3d5538f 100644 --- a/drivers/mtd/nor/cfi_flash.c +++ b/drivers/mtd/nor/cfi_flash.c @@ -652,14 +652,14 @@ static int cfi_mtd_protect(struct flash_info *finfo, loff_t offset, size_t len, return 0; } -static int cfi_mtd_lock(struct mtd_info *mtd, loff_t offset, size_t len) +static int cfi_mtd_lock(struct mtd_info *mtd, loff_t offset, uint64_t len) { struct flash_info *finfo = container_of(mtd, struct flash_info, mtd); return cfi_mtd_protect(finfo, offset, len, 1); } -static int cfi_mtd_unlock(struct mtd_info *mtd, loff_t offset, size_t len) +static int cfi_mtd_unlock(struct mtd_info *mtd, loff_t offset, uint64_t len) { struct flash_info *finfo = container_of(mtd, struct flash_info, mtd); diff --git a/drivers/mtd/partition.c b/drivers/mtd/partition.c index 4ebc5bba41..c53375e0e2 100644 --- a/drivers/mtd/partition.c +++ b/drivers/mtd/partition.c @@ -80,7 +80,7 @@ static int mtd_part_erase(struct mtd_info *mtd, struct erase_info *instr) return ret; } -static int mtd_part_lock(struct mtd_info *mtd, loff_t offset, size_t len) +static int mtd_part_lock(struct mtd_info *mtd, loff_t offset, uint64_t len) { if (!mtd->parent->_lock) return -ENOSYS; @@ -96,7 +96,7 @@ static int mtd_part_lock(struct mtd_info *mtd, loff_t offset, size_t len) return mtd->parent->_lock(mtd->parent, offset, len); } -static int mtd_part_unlock(struct mtd_info *mtd, loff_t offset, size_t len) +static int mtd_part_unlock(struct mtd_info *mtd, loff_t offset, uint64_t len) { if (!mtd->parent->_unlock) return -ENOSYS; diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index 1773db09a1..9fdcffeed1 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -546,12 +546,12 @@ erase_err: return ret; } -static int spi_nor_lock(struct mtd_info *mtd, loff_t ofs, size_t len) +static int spi_nor_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len) { return 0; } -static int spi_nor_unlock(struct mtd_info *mtd, loff_t ofs, size_t len) +static int spi_nor_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len) { struct spi_nor *nor = mtd_to_spi_nor(mtd); uint8_t status; diff --git a/drivers/net/e1000/mtd.c b/drivers/net/e1000/mtd.c index d472bd10a9..50883fc2a6 100644 --- a/drivers/net/e1000/mtd.c +++ b/drivers/net/e1000/mtd.c @@ -688,12 +688,12 @@ static int e1000_mtd_sr_rmw(struct mtd_info *mtd, u8 mask, u8 val) */ #define SR_BPALL (SR_BP0 | SR_BP1 | SR_BP2) -static int e1000_mtd_lock(struct mtd_info *mtd, loff_t ofs, size_t len) +static int e1000_mtd_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len) { return e1000_mtd_sr_rmw(mtd, SR_BPALL, SR_BPALL); } -static int e1000_mtd_unlock(struct mtd_info *mtd, loff_t ofs, size_t len) +static int e1000_mtd_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len) { return e1000_mtd_sr_rmw(mtd, SR_BPALL, 0x0); } diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 54cb2ec64c..530f743e68 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -198,8 +198,8 @@ struct mtd_info { void (*_sync) (struct mtd_info *mtd); /* Chip-supported device locking */ - int (*_lock) (struct mtd_info *mtd, loff_t ofs, size_t len); - int (*_unlock) (struct mtd_info *mtd, loff_t ofs, size_t len); + int (*_lock) (struct mtd_info *mtd, loff_t ofs, uint64_t len); + int (*_unlock) (struct mtd_info *mtd, loff_t ofs, uint64_t len); /* Bad block management functions */ int (*_block_isbad) (struct mtd_info *mtd, loff_t ofs); |