Merge tag 'sound-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[mirror_ubuntu-zesty-kernel.git] / include / linux / firmware.h

diff --git a/include/linux/firmware.h b/include/linux/firmware.h
index 59529330efd639a51eac5c7db114ed2c63534ade..5c41c5e75b5c0ba0a57b44a29893188204040ddb 100644 (file)
--- a/include/linux/firmware.h
+++ b/include/linux/firmware.h
@@ -45,6 +45,8 @@ int request_firmware_nowait(
        struct module *module, bool uevent,
        const char *name, struct device *device, gfp_t gfp, void *context,
        void (*cont)(const struct firmware *fw, void *context));
+int request_firmware_direct(const struct firmware **fw, const char *name,
+                           struct device *device);
 
 void release_firmware(const struct firmware *fw);
 #else
@@ -66,13 +68,12 @@ static inline void release_firmware(const struct firmware *fw)
 {
 }
 
-#endif
+static inline int request_firmware_direct(const struct firmware **fw,
+                                         const char *name,
+                                         struct device *device)
+{
+       return -EINVAL;
+}
 
-#ifdef CONFIG_FW_LOADER_USER_HELPER
-int request_firmware_direct(const struct firmware **fw, const char *name,
-                           struct device *device);
-#else
-#define request_firmware_direct        request_firmware
 #endif
-
 #endif