aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Liu <lliubbo@gmail.com>2011-01-26 05:33:32 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-03 18:39:17 -0500
commit072fc8f0a8df9bf36392f15b729044cb2ad27332 (patch)
tree4e4fba1f8e36da34fcb44d015a217d1e2bb4c790
parent8ba6ebf583f12da32036fc0f003ab4043e54692e (diff)
firmware_classs: change val uevent's type to bool
Some place in firmware_class.c using "int uevent" define, but others use "bool uevent". This patch replace all int uevent define to bool. Signed-off-by: Bob Liu <lliubbo@gmail.com> Acked-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/base/firmware_class.c7
-rw-r--r--include/linux/firmware.h4
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
593request_firmware(const struct firmware **firmware_p, const char *name, 593request_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
624static int request_firmware_work_func(void *arg) 623static int request_firmware_work_func(void *arg)
@@ -661,7 +660,7 @@ static int request_firmware_work_func(void *arg)
661 **/ 660 **/
662int 661int
663request_firmware_nowait( 662request_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 {
39int request_firmware(const struct firmware **fw, const char *name, 39int request_firmware(const struct firmware **fw, const char *name,
40 struct device *device); 40 struct device *device);
41int request_firmware_nowait( 41int 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}
54static inline int request_firmware_nowait( 54static 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{