diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-04-06 20:55:10 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-04-06 20:55:10 +0200 |
commit | eec2e9b2433983c775a692295a3c06799a9811d4 (patch) | |
tree | 2042b2fbd5a6b4a3230d5f5db3575d3822309228 /include | |
parent | d37201edc188364e9bb1d2e747de6c7fe1af8aaf (diff) | |
parent | 46e7bfbac6fa7d674e0536e012a2cb6af16abd34 (diff) | |
download | barebox-eec2e9b2433983c775a692295a3c06799a9811d4.tar.gz barebox-eec2e9b2433983c775a692295a3c06799a9811d4.tar.xz |
Merge branch 'for-next/fs'
Diffstat (limited to 'include')
-rw-r--r-- | include/console.h | 2 | ||||
-rw-r--r-- | include/driver.h | 4 | ||||
-rw-r--r-- | include/linux/fs.h | 5 | ||||
-rw-r--r-- | include/mfd/twl-core.h | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/include/console.h b/include/console.h index a8b2663a4c..3c14e35935 100644 --- a/include/console.h +++ b/include/console.h @@ -63,7 +63,7 @@ struct console_device { const char *linux_console_name; struct cdev devfs; - struct file_operations fops; + struct cdev_operations fops; }; int console_register(struct console_device *cdev); diff --git a/include/driver.h b/include/driver.h index f37805db17..91653b7946 100644 --- a/include/driver.h +++ b/include/driver.h @@ -420,7 +420,7 @@ int platform_driver_register(struct driver_d *drv); int platform_device_register(struct device_d *new_device); -struct file_operations { +struct cdev_operations { /*! Called in response of reading from this device. Required */ ssize_t (*read)(struct cdev*, void* buf, size_t count, loff_t offset, ulong flags); @@ -441,7 +441,7 @@ struct file_operations { #define MAX_PARTUUID_STR sizeof("00112233-4455-6677-8899-AABBCCDDEEFF") struct cdev { - const struct file_operations *ops; + const struct cdev_operations *ops; void *priv; struct device_d *dev; struct device_node *device_node; diff --git a/include/linux/fs.h b/include/linux/fs.h index c1a5802eea..153c464470 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -252,6 +252,11 @@ struct file { #endif }; +struct super_operations { + struct inode *(*alloc_inode)(struct super_block *sb); + void (*destroy_inode)(struct inode *); +}; + /* * Inode flags - they have no relation to superblock flags now */ diff --git a/include/mfd/twl-core.h b/include/mfd/twl-core.h index f090032b3f..88d29f019b 100644 --- a/include/mfd/twl-core.h +++ b/include/mfd/twl-core.h @@ -21,7 +21,7 @@ struct twlcore { struct i2c_client *client; }; -extern struct file_operations twl_fops; +extern struct cdev_operations twl_fops; extern int twlcore_reg_read(struct twlcore *twlcore, u16 reg, u8 *val); extern int twlcore_reg_write(struct twlcore *twlcore, u16 reg, u8 val); |