diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/firmware.h | 8 | ||||
| -rw-r--r-- | include/linux/fs.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/firmware.h b/include/linux/firmware.h index 5c41c5e75b5c..b1f9f0ccb8ac 100644 --- a/include/linux/firmware.h +++ b/include/linux/firmware.h | |||
| @@ -47,6 +47,8 @@ int request_firmware_nowait( | |||
| 47 | void (*cont)(const struct firmware *fw, void *context)); | 47 | void (*cont)(const struct firmware *fw, void *context)); |
| 48 | int request_firmware_direct(const struct firmware **fw, const char *name, | 48 | int request_firmware_direct(const struct firmware **fw, const char *name, |
| 49 | struct device *device); | 49 | struct device *device); |
| 50 | int request_firmware_into_buf(const struct firmware **firmware_p, | ||
| 51 | const char *name, struct device *device, void *buf, size_t size); | ||
| 50 | 52 | ||
| 51 | void release_firmware(const struct firmware *fw); | 53 | void release_firmware(const struct firmware *fw); |
| 52 | #else | 54 | #else |
| @@ -75,5 +77,11 @@ static inline int request_firmware_direct(const struct firmware **fw, | |||
| 75 | return -EINVAL; | 77 | return -EINVAL; |
| 76 | } | 78 | } |
| 77 | 79 | ||
| 80 | static inline int request_firmware_into_buf(const struct firmware **firmware_p, | ||
| 81 | const char *name, struct device *device, void *buf, size_t size) | ||
| 82 | { | ||
| 83 | return -EINVAL; | ||
| 84 | } | ||
| 85 | |||
| 78 | #endif | 86 | #endif |
| 79 | #endif | 87 | #endif |
diff --git a/include/linux/fs.h b/include/linux/fs.h index 577365a77b47..f3f0b4c8e8ac 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
| @@ -2652,6 +2652,7 @@ extern int do_pipe_flags(int *, int); | |||
| 2652 | #define __kernel_read_file_id(id) \ | 2652 | #define __kernel_read_file_id(id) \ |
| 2653 | id(UNKNOWN, unknown) \ | 2653 | id(UNKNOWN, unknown) \ |
| 2654 | id(FIRMWARE, firmware) \ | 2654 | id(FIRMWARE, firmware) \ |
| 2655 | id(FIRMWARE_PREALLOC_BUFFER, firmware) \ | ||
| 2655 | id(MODULE, kernel-module) \ | 2656 | id(MODULE, kernel-module) \ |
| 2656 | id(KEXEC_IMAGE, kexec-image) \ | 2657 | id(KEXEC_IMAGE, kexec-image) \ |
| 2657 | id(KEXEC_INITRAMFS, kexec-initramfs) \ | 2658 | id(KEXEC_INITRAMFS, kexec-initramfs) \ |
