Commit c2c07616 authored by Scott Branden's avatar Scott Branden Committed by Greg Kroah-Hartman
Browse files

firmware_loader: change enum fw_opt to u32 



"enum fw_opt" is not used as an enum.
Change fw_opt to u32 as FW_OPT_* values are OR'd together.

Signed-off-by: default avatarScott Branden <scott.branden@broadcom.com>
Acked-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Link: https://lore.kernel.org/r/20200522231202.13681-1-scott.branden@broadcom.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 46d26819

drivers/base/firmware_loader/fallback.c

+6 −6
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ static const struct attribute_group *fw_dev_attr_groups[] = { 


static struct fw_sysfs *

fw_create_instance(struct firmware *firmware, const char *fw_name,

		   struct device *device, enum fw_opt opt_flags)

		   struct device *device, u32 opt_flags)

{

	struct fw_sysfs *fw_sysfs;

	struct device *f_dev;
@@ -496,7 +496,7 @@ exit: 
 * In charge of constructing a sysfs fallback interface for firmware loading.

 **/

static int fw_load_sysfs_fallback(struct fw_sysfs *fw_sysfs,

				  enum fw_opt opt_flags, long timeout)

				  u32 opt_flags, long timeout)

{

	int retval = 0;

	struct device *f_dev = &fw_sysfs->dev;
@@ -550,7 +550,7 @@ err_put_dev: 


static int fw_load_from_user_helper(struct firmware *firmware,

				    const char *name, struct device *device,

				    enum fw_opt opt_flags)

				    u32 opt_flags)

{

	struct fw_sysfs *fw_sysfs;

	long timeout;
@@ -591,7 +591,7 @@ out_unlock: 
	return ret;

}



static bool fw_force_sysfs_fallback(enum fw_opt opt_flags)

static bool fw_force_sysfs_fallback(u32 opt_flags)

{

	if (fw_fallback_config.force_sysfs_fallback)

		return true;
@@ -600,7 +600,7 @@ static bool fw_force_sysfs_fallback(enum fw_opt opt_flags) 
	return true;

}



static bool fw_run_sysfs_fallback(enum fw_opt opt_flags)

static bool fw_run_sysfs_fallback(u32 opt_flags)

{

	int ret;
@@ -643,7 +643,7 @@ static bool fw_run_sysfs_fallback(enum fw_opt opt_flags) 
 **/

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

			    struct device *device,

			    enum fw_opt opt_flags,

			    u32 opt_flags,

			    int ret)

{

	if (!fw_run_sysfs_fallback(opt_flags))

drivers/base/firmware_loader/fallback.h

+4 −4
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ struct firmware_fallback_config { 
#ifdef CONFIG_FW_LOADER_USER_HELPER

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

			    struct device *device,

			    enum fw_opt opt_flags,

			    u32 opt_flags,

			    int ret);

void kill_pending_fw_fallback_reqs(bool only_kill_custom);
@@ -45,7 +45,7 @@ void unregister_sysfs_loader(void); 
#else /* CONFIG_FW_LOADER_USER_HELPER */

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

					  struct device *device,

					  enum fw_opt opt_flags,

					  u32 opt_flags,

					  int ret)

{

	/* Keep carrying over the same error */
@@ -67,10 +67,10 @@ static inline void unregister_sysfs_loader(void) 
#endif /* CONFIG_FW_LOADER_USER_HELPER */



#ifdef CONFIG_EFI_EMBEDDED_FIRMWARE

int firmware_fallback_platform(struct fw_priv *fw_priv, enum fw_opt opt_flags);

int firmware_fallback_platform(struct fw_priv *fw_priv, u32 opt_flags);

#else

static inline int firmware_fallback_platform(struct fw_priv *fw_priv,

					     enum fw_opt opt_flags)

					     u32 opt_flags)

{

	return -ENOENT;

}

drivers/base/firmware_loader/fallback_platform.c

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#include "fallback.h"

#include "firmware.h"



int firmware_fallback_platform(struct fw_priv *fw_priv, enum fw_opt opt_flags)

int firmware_fallback_platform(struct fw_priv *fw_priv, u32 opt_flags)

{

	const u8 *data;

	size_t size;

drivers/base/firmware_loader/firmware.h

+1 −2
Original line number Diff line number Diff line
@@ -136,8 +136,7 @@ static inline void fw_state_done(struct fw_priv *fw_priv) 
	__fw_state_set(fw_priv, FW_STATUS_DONE);

}



int assign_fw(struct firmware *fw, struct device *device,

	      enum fw_opt opt_flags);

int assign_fw(struct firmware *fw, struct device *device, u32 opt_flags);



#ifdef CONFIG_FW_LOADER_PAGED_BUF

void fw_free_paged_buf(struct fw_priv *fw_priv);

drivers/base/firmware_loader/main.c

+5 −6
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static struct fw_priv *__lookup_fw_priv(const char *fw_name) 
static int alloc_lookup_fw_priv(const char *fw_name,

				struct firmware_cache *fwc,

				struct fw_priv **fw_priv, void *dbuf,

				size_t size, enum fw_opt opt_flags)

				size_t size, u32 opt_flags)

{

	struct fw_priv *tmp;
@@ -632,8 +632,7 @@ static int fw_add_devm_name(struct device *dev, const char *name) 
}

#endif



int assign_fw(struct firmware *fw, struct device *device,

	      enum fw_opt opt_flags)

int assign_fw(struct firmware *fw, struct device *device, u32 opt_flags)

{

	struct fw_priv *fw_priv = fw->priv;

	int ret;
@@ -684,7 +683,7 @@ int assign_fw(struct firmware *fw, struct device *device, 
static int

_request_firmware_prepare(struct firmware **firmware_p, const char *name,

			  struct device *device, void *dbuf, size_t size,

			  enum fw_opt opt_flags)

			  u32 opt_flags)

{

	struct firmware *firmware;

	struct fw_priv *fw_priv;
@@ -750,7 +749,7 @@ static void fw_abort_batch_reqs(struct firmware *fw) 
static int

_request_firmware(const struct firmware **firmware_p, const char *name,

		  struct device *device, void *buf, size_t size,

		  enum fw_opt opt_flags)

		  u32 opt_flags)

{

	struct firmware *fw = NULL;

	int ret;
@@ -987,7 +986,7 @@ struct firmware_work { 
	struct device *device;

	void *context;

	void (*cont)(const struct firmware *fw, void *context);

	enum fw_opt opt_flags;

	u32 opt_flags;

};



static void request_firmware_work_func(struct work_struct *work)

CRA Git | Maintained and supported by SUSTech CRA and CCSE