From: Johannes Berg <johannes@sipsolutions.net>
Date: Mon, 1 Apr 2013 22:23:35 +0000 (+0200)
Subject: simplify and correct backported FW loader
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f44fa4ad873d70836f29084861ac822c60143934;p=openwrt%2Fstaging%2Fblogic.git

simplify and correct backported FW loader

The backported loader is selected by drivers
needing it, unless the in-kernel one is used,
so there's no need to provide the functions
for when it isn't built.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
---

diff --git a/compat/include/linux/compat-2.6.33.h b/compat/include/linux/compat-2.6.33.h
index 29305fded4ac..b03fe401cc80 100644
--- a/compat/include/linux/compat-2.6.33.h
+++ b/compat/include/linux/compat-2.6.33.h
@@ -37,7 +37,6 @@ static inline void usb_autopm_put_interface_no_suspend(struct usb_interface *int
 #define request_firmware LINUX_BACKPORT(request_firmware)
 #define release_firmware LINUX_BACKPORT(release_firmware)
 
-#if defined(CPTCFG_COMPAT_FW_LOADER)
 int request_firmware(const struct firmware **fw, const char *name,
 		     struct device *device);
 int request_firmware_nowait(
@@ -46,25 +45,6 @@ int request_firmware_nowait(
 	void (*cont)(const struct firmware *fw, void *context));
 
 void release_firmware(const struct firmware *fw);
-#else
-static inline int request_firmware(const struct firmware **fw,
-				   const char *name,
-				   struct device *device)
-{
-	return -EINVAL;
-}
-static inline int request_firmware_nowait(
-	struct module *module, int uevent,
-	const char *name, struct device *device, gfp_t gfp, void *context,
-	void (*cont)(const struct firmware *fw, void *context))
-{
-	return -EINVAL;
-}
-
-static inline void release_firmware(const struct firmware *fw)
-{
-}
-#endif
 #endif
 
 /* mask KEY_RFKILL as RHEL6 backports this */