diff options
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/core.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/mtdoob.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/mtdraw.c | 4 | ||||
| -rw-r--r-- | drivers/mtd/nand/nand-bb.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/ubi/barebox.c | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/drivers/mtd/core.c b/drivers/mtd/core.c index 1950ee87ee..d2012b5f70 100644 --- a/drivers/mtd/core.c +++ b/drivers/mtd/core.c @@ -438,7 +438,7 @@ int mtd_read_oob(struct mtd_info *mtd, loff_t from, struct mtd_oob_ops *ops) return ret_code >= mtd->bitflip_threshold ? -EUCLEAN : 0; } -static struct file_operations mtd_ops = { +static struct cdev_operations mtd_ops = { .read = mtd_op_read, #ifdef CONFIG_MTD_WRITE .write = mtd_op_write, diff --git a/drivers/mtd/mtdoob.c b/drivers/mtd/mtdoob.c index 86076f028d..ffaf9506f3 100644 --- a/drivers/mtd/mtdoob.c +++ b/drivers/mtd/mtdoob.c @@ -63,7 +63,7 @@ static ssize_t mtd_op_read_oob(struct cdev *cdev, void *buf, size_t count, return mtd->oobsize; } -static struct file_operations mtd_ops_oob = { +static struct cdev_operations mtd_ops_oob = { .read = mtd_op_read_oob, .ioctl = mtd_ioctl, .lseek = dev_lseek_default, diff --git a/drivers/mtd/mtdraw.c b/drivers/mtd/mtdraw.c index ab360b7862..4f7c3b836c 100644 --- a/drivers/mtd/mtdraw.c +++ b/drivers/mtd/mtdraw.c @@ -287,7 +287,7 @@ static ssize_t mtdraw_erase(struct cdev *cdev, loff_t count, loff_t offset) } #endif -static const struct file_operations mtd_raw_fops = { +static const struct cdev_operations mtd_raw_fops = { .read = mtdraw_read, .write = mtdraw_write, .erase = mtdraw_erase, @@ -305,7 +305,7 @@ static int add_mtdraw_device(struct mtd_info *mtd, const char *devname, void **p mtdraw->writebuf = xmalloc(RAW_WRITEBUF_SIZE); mtdraw->mtd = mtd; - mtdraw->cdev.ops = (struct file_operations *)&mtd_raw_fops; + mtdraw->cdev.ops = (struct cdev_operations *)&mtd_raw_fops; mtdraw->cdev.size = mtd_div_by_wb(mtd->size, mtd) * (mtd->writesize + mtd->oobsize); mtdraw->cdev.name = basprintf("%s.raw", mtd->cdev.name); diff --git a/drivers/mtd/nand/nand-bb.c b/drivers/mtd/nand/nand-bb.c index a1523c3c89..c1977381d4 100644 --- a/drivers/mtd/nand/nand-bb.c +++ b/drivers/mtd/nand/nand-bb.c @@ -264,7 +264,7 @@ static loff_t nand_bb_lseek(struct cdev *cdev, loff_t __offset) return -EINVAL; } -static struct file_operations nand_bb_ops = { +static struct cdev_operations nand_bb_ops = { .open = nand_bb_open, .close = nand_bb_close, .read = nand_bb_read, diff --git a/drivers/mtd/ubi/barebox.c b/drivers/mtd/ubi/barebox.c index d67e566db6..65f5456455 100644 --- a/drivers/mtd/ubi/barebox.c +++ b/drivers/mtd/ubi/barebox.c @@ -218,7 +218,7 @@ static int ubi_volume_cdev_ioctl(struct cdev *cdev, int cmd, void *buf) return err; } -static struct file_operations ubi_volume_fops = { +static struct cdev_operations ubi_volume_fops = { .open = ubi_volume_cdev_open, .close = ubi_volume_cdev_close, .read = ubi_volume_cdev_read, @@ -467,7 +467,7 @@ static int ubi_cdev_ioctl(struct cdev *cdev, int cmd, void *buf) return 0; } -static struct file_operations ubi_fops = { +static struct cdev_operations ubi_fops = { .ioctl = ubi_cdev_ioctl, }; |