diff options
author | Takashi Iwai <tiwai@suse.de> | 2016-07-25 13:39:53 (GMT) |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2016-07-26 08:38:03 (GMT) |
commit | 0984d159c8ad6618c6ebd9f00bc3f374fa52bc35 (patch) | |
tree | 442d6bfa62d1f6baee7a251db6adf845ef2ea679 /sound/oss/sound_firmware.h | |
parent | 4a6baf1b35891ebc877e91a803877d69b703e086 (diff) | |
download | linux-0984d159c8ad6618c6ebd9f00bc3f374fa52bc35.tar.xz |
sound: oss: Use kernel_read_file_from_path() for mod_firmware_load()
Since recently we have kernel_read_file_from_path(), and it's doing
the same thing as our own home-baked mod_firmware_load(). Let's use
the official API function and clean up the old code.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/oss/sound_firmware.h')
-rw-r--r-- | sound/oss/sound_firmware.h | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/sound/oss/sound_firmware.h b/sound/oss/sound_firmware.h index 0a0cbfd..da4c67e 100644 --- a/sound/oss/sound_firmware.h +++ b/sound/oss/sound_firmware.h @@ -1,2 +1,29 @@ -extern int mod_firmware_load(const char *fn, char **fp); +#include <linux/fs.h> +/** + * mod_firmware_load - load sound driver firmware + * @fn: filename + * @fp: return for the buffer. + * + * Load the firmware for a sound module (up to 128K) into a buffer. + * The buffer is returned in *fp. It is allocated with vmalloc so is + * virtually linear and not DMAable. The caller should free it with + * vfree when finished. + * + * The length of the buffer is returned on a successful load, the + * value zero on a failure. + * + * Caution: This API is not recommended. Firmware should be loaded via + * request_firmware. + */ +static inline int mod_firmware_load(const char *fn, char **fp) +{ + loff_t size; + int err; + + err = kernel_read_file_from_path((char *)fn, (void **)fp, &size, + 131072, READING_FIRMWARE); + if (err < 0) + return 0; + return size; +} |