diff options
-rw-r--r-- | drivers/base/firmware_class.c | 7 | ||||
-rw-r--r-- | include/linux/firmware.h | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 40af43ebd92d..8c798ef7f13f 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c | |||
@@ -593,8 +593,7 @@ int | |||
593 | request_firmware(const struct firmware **firmware_p, const char *name, | 593 | request_firmware(const struct firmware **firmware_p, const char *name, |
594 | struct device *device) | 594 | struct device *device) |
595 | { | 595 | { |
596 | int uevent = 1; | 596 | return _request_firmware(firmware_p, name, device, true, false); |
597 | return _request_firmware(firmware_p, name, device, uevent, false); | ||
598 | } | 597 | } |
599 | 598 | ||
600 | /** | 599 | /** |
@@ -618,7 +617,7 @@ struct firmware_work { | |||
618 | struct device *device; | 617 | struct device *device; |
619 | void *context; | 618 | void *context; |
620 | void (*cont)(const struct firmware *fw, void *context); | 619 | void (*cont)(const struct firmware *fw, void *context); |
621 | int uevent; | 620 | bool uevent; |
622 | }; | 621 | }; |
623 | 622 | ||
624 | static int request_firmware_work_func(void *arg) | 623 | static int request_firmware_work_func(void *arg) |
@@ -661,7 +660,7 @@ static int request_firmware_work_func(void *arg) | |||
661 | **/ | 660 | **/ |
662 | int | 661 | int |
663 | request_firmware_nowait( | 662 | request_firmware_nowait( |
664 | struct module *module, int uevent, | 663 | struct module *module, bool uevent, |
665 | const char *name, struct device *device, gfp_t gfp, void *context, | 664 | const char *name, struct device *device, gfp_t gfp, void *context, |
666 | void (*cont)(const struct firmware *fw, void *context)) | 665 | void (*cont)(const struct firmware *fw, void *context)) |
667 | { | 666 | { |
diff --git a/include/linux/firmware.h b/include/linux/firmware.h index 53d1e6c4f848..21b3e7588abd 100644 --- a/include/linux/firmware.h +++ b/include/linux/firmware.h | |||
@@ -39,7 +39,7 @@ struct builtin_fw { | |||
39 | int request_firmware(const struct firmware **fw, const char *name, | 39 | int request_firmware(const struct firmware **fw, const char *name, |
40 | struct device *device); | 40 | struct device *device); |
41 | int request_firmware_nowait( | 41 | int request_firmware_nowait( |
42 | struct module *module, int uevent, | 42 | struct module *module, bool uevent, |
43 | const char *name, struct device *device, gfp_t gfp, void *context, | 43 | const char *name, struct device *device, gfp_t gfp, void *context, |
44 | void (*cont)(const struct firmware *fw, void *context)); | 44 | void (*cont)(const struct firmware *fw, void *context)); |
45 | 45 | ||
@@ -52,7 +52,7 @@ static inline int request_firmware(const struct firmware **fw, | |||
52 | return -EINVAL; | 52 | return -EINVAL; |
53 | } | 53 | } |
54 | static inline int request_firmware_nowait( | 54 | static inline int request_firmware_nowait( |
55 | struct module *module, int uevent, | 55 | struct module *module, bool uevent, |
56 | const char *name, struct device *device, gfp_t gfp, void *context, | 56 | const char *name, struct device *device, gfp_t gfp, void *context, |
57 | void (*cont)(const struct firmware *fw, void *context)) | 57 | void (*cont)(const struct firmware *fw, void *context)) |
58 | { | 58 | { |