diff options
author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-03-07 09:57:54 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-03-10 19:33:33 -0400 |
commit | fbab976d7ce4556d4212d554f766dae461d22e16 (patch) | |
tree | 31328b2b8ced734069c577f6ad6a98ce561af270 | |
parent | 661b4e89daf10e3f65a1086fd95c7a84720ccdd2 (diff) |
firmware: provide stubs for the FW_LOADER=n case
libsas has a case where it uses the firmware loader to provide services,
but doesn't want to select it all the time. This currently causes a
compile failure in libsas if FW_LOADER=n. Fix this by providing error
stubs for the firmware loader API in the FW_LOADER=n case.
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | include/linux/firmware.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/include/linux/firmware.h b/include/linux/firmware.h index 33d8f2087b6e..4d10c7328d2d 100644 --- a/include/linux/firmware.h +++ b/include/linux/firmware.h | |||
@@ -10,7 +10,10 @@ struct firmware { | |||
10 | size_t size; | 10 | size_t size; |
11 | u8 *data; | 11 | u8 *data; |
12 | }; | 12 | }; |
13 | |||
13 | struct device; | 14 | struct device; |
15 | |||
16 | #if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE) | ||
14 | int request_firmware(const struct firmware **fw, const char *name, | 17 | int request_firmware(const struct firmware **fw, const char *name, |
15 | struct device *device); | 18 | struct device *device); |
16 | int request_firmware_nowait( | 19 | int request_firmware_nowait( |
@@ -19,4 +22,24 @@ int request_firmware_nowait( | |||
19 | void (*cont)(const struct firmware *fw, void *context)); | 22 | void (*cont)(const struct firmware *fw, void *context)); |
20 | 23 | ||
21 | void release_firmware(const struct firmware *fw); | 24 | void release_firmware(const struct firmware *fw); |
25 | #else | ||
26 | static inline int request_firmware(const struct firmware **fw, | ||
27 | const char *name, | ||
28 | struct device *device) | ||
29 | { | ||
30 | return -EINVAL; | ||
31 | } | ||
32 | static inline int request_firmware_nowait( | ||
33 | struct module *module, int uevent, | ||
34 | const char *name, struct device *device, void *context, | ||
35 | void (*cont)(const struct firmware *fw, void *context)) | ||
36 | { | ||
37 | return -EINVAL; | ||
38 | } | ||
39 | |||
40 | static inline void release_firmware(const struct firmware *fw) | ||
41 | { | ||
42 | } | ||
43 | #endif | ||
44 | |||
22 | #endif | 45 | #endif |