diff options
author | Andres Rodriguez <andresx7@gmail.com> | 2018-05-10 16:08:37 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-05-14 10:43:09 -0400 |
commit | eb33eb04926e40331750f538a58d93cde87afaa4 (patch) | |
tree | 5b02d76d2521a37893d1b7ba3ec4a9969c0de5ff /drivers/base/firmware_loader/fallback.c | |
parent | 84d0c27d6233a9ba0578b20f5a09701eb66cee42 (diff) |
firmware: wrap FW_OPT_* into an enum
This should let us associate enum kdoc to these values.
While at it, kdocify the fw_opt.
Signed-off-by: Andres Rodriguez <andresx7@gmail.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Acked-by: Luis R. Rodriguez <mcgrof@kernel.org>
[mcgrof: coding style fixes, merge kdoc with enum move]
Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base/firmware_loader/fallback.c')
-rw-r--r-- | drivers/base/firmware_loader/fallback.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/base/firmware_loader/fallback.c b/drivers/base/firmware_loader/fallback.c index 358354148dec..b57a7b3b4122 100644 --- a/drivers/base/firmware_loader/fallback.c +++ b/drivers/base/firmware_loader/fallback.c | |||
@@ -512,7 +512,7 @@ static const struct attribute_group *fw_dev_attr_groups[] = { | |||
512 | 512 | ||
513 | static struct fw_sysfs * | 513 | static struct fw_sysfs * |
514 | fw_create_instance(struct firmware *firmware, const char *fw_name, | 514 | fw_create_instance(struct firmware *firmware, const char *fw_name, |
515 | struct device *device, unsigned int opt_flags) | 515 | struct device *device, enum fw_opt opt_flags) |
516 | { | 516 | { |
517 | struct fw_sysfs *fw_sysfs; | 517 | struct fw_sysfs *fw_sysfs; |
518 | struct device *f_dev; | 518 | struct device *f_dev; |
@@ -545,7 +545,7 @@ exit: | |||
545 | * In charge of constructing a sysfs fallback interface for firmware loading. | 545 | * In charge of constructing a sysfs fallback interface for firmware loading. |
546 | **/ | 546 | **/ |
547 | static int fw_load_sysfs_fallback(struct fw_sysfs *fw_sysfs, | 547 | static int fw_load_sysfs_fallback(struct fw_sysfs *fw_sysfs, |
548 | unsigned int opt_flags, long timeout) | 548 | enum fw_opt opt_flags, long timeout) |
549 | { | 549 | { |
550 | int retval = 0; | 550 | int retval = 0; |
551 | struct device *f_dev = &fw_sysfs->dev; | 551 | struct device *f_dev = &fw_sysfs->dev; |
@@ -599,7 +599,7 @@ err_put_dev: | |||
599 | 599 | ||
600 | static int fw_load_from_user_helper(struct firmware *firmware, | 600 | static int fw_load_from_user_helper(struct firmware *firmware, |
601 | const char *name, struct device *device, | 601 | const char *name, struct device *device, |
602 | unsigned int opt_flags) | 602 | enum fw_opt opt_flags) |
603 | { | 603 | { |
604 | struct fw_sysfs *fw_sysfs; | 604 | struct fw_sysfs *fw_sysfs; |
605 | long timeout; | 605 | long timeout; |
@@ -640,7 +640,7 @@ out_unlock: | |||
640 | return ret; | 640 | return ret; |
641 | } | 641 | } |
642 | 642 | ||
643 | static bool fw_force_sysfs_fallback(unsigned int opt_flags) | 643 | static bool fw_force_sysfs_fallback(enum fw_opt opt_flags) |
644 | { | 644 | { |
645 | if (fw_fallback_config.force_sysfs_fallback) | 645 | if (fw_fallback_config.force_sysfs_fallback) |
646 | return true; | 646 | return true; |
@@ -649,7 +649,7 @@ static bool fw_force_sysfs_fallback(unsigned int opt_flags) | |||
649 | return true; | 649 | return true; |
650 | } | 650 | } |
651 | 651 | ||
652 | static bool fw_run_sysfs_fallback(unsigned int opt_flags) | 652 | static bool fw_run_sysfs_fallback(enum fw_opt opt_flags) |
653 | { | 653 | { |
654 | if (fw_fallback_config.ignore_sysfs_fallback) { | 654 | if (fw_fallback_config.ignore_sysfs_fallback) { |
655 | pr_info_once("Ignoring firmware sysfs fallback due to sysctl knob\n"); | 655 | pr_info_once("Ignoring firmware sysfs fallback due to sysctl knob\n"); |
@@ -664,7 +664,7 @@ static bool fw_run_sysfs_fallback(unsigned int opt_flags) | |||
664 | 664 | ||
665 | int fw_sysfs_fallback(struct firmware *fw, const char *name, | 665 | int fw_sysfs_fallback(struct firmware *fw, const char *name, |
666 | struct device *device, | 666 | struct device *device, |
667 | unsigned int opt_flags, | 667 | enum fw_opt opt_flags, |
668 | int ret) | 668 | int ret) |
669 | { | 669 | { |
670 | if (!fw_run_sysfs_fallback(opt_flags)) | 670 | if (!fw_run_sysfs_fallback(opt_flags)) |