diff options
| author | Mark Brown <broonie@kernel.org> | 2021-09-20 17:56:58 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-09-21 17:23:35 +0300 |
| commit | ffb1e76f4f32d2b8ea4189df0484980370476395 (patch) | |
| tree | c62376eab558809973dc5b71806df07c388bfc1a /include/linux/mdev.h | |
| parent | 2bab94090b01bc593d8bc25f68df41f198721173 (diff) | |
| parent | e4e737bb5c170df6135a127739a9e6148ee3da82 (diff) | |
| download | linux-ffb1e76f4f32d2b8ea4189df0484980370476395.tar.xz | |
Merge tag 'v5.15-rc2' into spi-5.15
Linux 5.15-rc2
Diffstat (limited to 'include/linux/mdev.h')
| -rw-r--r-- | include/linux/mdev.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/linux/mdev.h b/include/linux/mdev.h index 3a38598c2605..68427e8fadeb 100644 --- a/include/linux/mdev.h +++ b/include/linux/mdev.h @@ -72,11 +72,6 @@ struct device *mtype_get_parent_dev(struct mdev_type *mtype); * @mdev: mdev_device device structure which is being * destroyed * Returns integer: success (0) or error (< 0) - * @open: Open mediated device. - * @mdev: mediated device. - * Returns integer: success (0) or error (< 0) - * @release: release mediated device - * @mdev: mediated device. * @read: Read emulation callback * @mdev: mediated device structure * @buf: read buffer @@ -111,8 +106,8 @@ struct mdev_parent_ops { int (*create)(struct mdev_device *mdev); int (*remove)(struct mdev_device *mdev); - int (*open)(struct mdev_device *mdev); - void (*release)(struct mdev_device *mdev); + int (*open_device)(struct mdev_device *mdev); + void (*close_device)(struct mdev_device *mdev); ssize_t (*read)(struct mdev_device *mdev, char __user *buf, size_t count, loff_t *ppos); ssize_t (*write)(struct mdev_device *mdev, const char __user *buf, |