Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf1cde7c authored by Andres Rodriguez's avatar Andres Rodriguez Committed by Greg Kroah-Hartman
Browse files

firmware: rename fw_sysfs_fallback to firmware_fallback_sysfs() 



This is done since this call is now exposed through kernel-doc,
and since this also paves the way for different future types of
fallback mechanims.

Signed-off-by: default avatarAndres Rodriguez <andresx7@gmail.com>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarLuis R. Rodriguez <mcgrof@kernel.org>
[mcgrof: small coding style changes]
Signed-off-by: default avatarLuis R. Rodriguez <mcgrof@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c35f9cbb

drivers/base/firmware_loader/fallback.c

+4 −4
Original line number Diff line number Diff line
@@ -662,7 +662,7 @@ static bool fw_run_sysfs_fallback(enum fw_opt opt_flags) 
	return fw_force_sysfs_fallback(opt_flags);

}



int fw_sysfs_fallback(struct firmware *fw, const char *name,

int firmware_fallback_sysfs(struct firmware *fw, const char *name,

			    struct device *device,

			    enum fw_opt opt_flags,

			    int ret)

drivers/base/firmware_loader/fallback.h

+8 −8
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct firmware_fallback_config { 
};



#ifdef CONFIG_FW_LOADER_USER_HELPER

int fw_sysfs_fallback(struct firmware *fw, const char *name,

int firmware_fallback_sysfs(struct firmware *fw, const char *name,

			    struct device *device,

			    enum fw_opt opt_flags,

			    int ret);
@@ -43,7 +43,7 @@ void fw_fallback_set_default_timeout(void); 
int register_sysfs_loader(void);

void unregister_sysfs_loader(void);

#else /* CONFIG_FW_LOADER_USER_HELPER */

static inline int fw_sysfs_fallback(struct firmware *fw, const char *name,

static inline int firmware_fallback_sysfs(struct firmware *fw, const char *name,

					  struct device *device,

					  enum fw_opt opt_flags,

					  int ret)

drivers/base/firmware_loader/firmware.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
 * @FW_OPT_NOWAIT: Used to describe the firmware request is asynchronous.

 * @FW_OPT_USERHELPER: Enable the fallback mechanism, in case the direct

 *	filesystem lookup fails at finding the firmware.  For details refer to

 *	fw_sysfs_fallback().

 *	firmware_fallback_sysfs().

 * @FW_OPT_NO_WARN: Quiet, avoid printing warning messages.

 * @FW_OPT_NOCACHE: Disables firmware caching. Firmware caching is used to

 *	cache the firmware upon suspend, so that upon resume races against the

drivers/base/firmware_loader/main.c

+1 −1
Original line number Diff line number Diff line
@@ -581,7 +581,7 @@ _request_firmware(const struct firmware **firmware_p, const char *name, 
			dev_warn(device,

				 "Direct firmware load for %s failed with error %d\n",

				 name, ret);

		ret = fw_sysfs_fallback(fw, name, device, opt_flags, ret);

		ret = firmware_fallback_sysfs(fw, name, device, opt_flags, ret);

	} else

		ret = assign_fw(fw, device, opt_flags);