Skip to contentSkip to conversation

sound: oss: Use kernel_read_file_from_path() for mod_firmware_load()

PATCH New Takashi Iwai 1 participant 1 message Jul 25, 2016 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 sound/Makefile             |  1 -
 sound/oss/sound_firmware.h | 29 ++++++++++++++++-
 sound/sound_firmware.c     | 77 ----------------------------------------------
 3 files changed, 28 insertions(+), 79 deletions(-)
 delete mode 100644 sound/sound_firmware.c
sound/Makefile +0 -1
index 77320709fd26..c41bdf5fdf24 100644
@@ -2,7 +2,6 @@
 #
 
 obj-$(CONFIG_SOUND) += soundcore.o
-obj-$(CONFIG_SOUND_PRIME) += sound_firmware.o
 obj-$(CONFIG_SOUND_PRIME) += oss/
 obj-$(CONFIG_DMASOUND) += oss/
 obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ \
sound/oss/sound_firmware.h +28 -1
index 0a0cbfdfb855..da4c67e005ed 100644
@@ -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;
+}
sound/sound_firmware.c deleted +0 -77

77 lines not on this page · raw message

Signature · 1 line
2.9.2