Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

firmware_loader: Move definitions from sysfs_upload.h to sysfs.h 

Move definitions required by sysfs.c from sysfs_upload.h to sysfs.h so
that sysfs.c does not need to include sysfs_upload.h.

Signed-off-by: Russ Weight <russell.h.weight@intel.com>
Link: https://lore.kernel.org/r/20220426200356.126085-3-russell.h.weight@intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Russ Weight 2022-04-26 13:03:56 -07:00 committed by Greg Kroah-Hartman
parent bc187f6f8d
commit f8ae07f4b8
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/base/firmware_loader/sysfs.c
View File

@ -7,7 +7,6 @@
#include <linux/types.h> #include <linux/types.h>
#include "sysfs.h" #include "sysfs.h"
#include "sysfs_upload.h"
/* /*
* sysfs support for firmware loader * sysfs support for firmware loader

15
drivers/base/firmware_loader/sysfs.h
View File

@ -99,4 +99,19 @@ struct fw_sysfs *
fw_create_instance(struct firmware *firmware, const char *fw_name, fw_create_instance(struct firmware *firmware, const char *fw_name,
struct device *device, u32 opt_flags); struct device *device, u32 opt_flags);
#ifdef CONFIG_FW_UPLOAD
extern struct device_attribute dev_attr_status;
extern struct device_attribute dev_attr_error;
extern struct device_attribute dev_attr_cancel;
extern struct device_attribute dev_attr_remaining_size;
int fw_upload_start(struct fw_sysfs *fw_sysfs);
umode_t fw_upload_is_visible(struct kobject *kobj, struct attribute *attr, int n);
#else
static inline int fw_upload_start(struct fw_sysfs *fw_sysfs)
{
return 0;
}
#endif
#endif /* __FIRMWARE_SYSFS_H */ #endif /* __FIRMWARE_SYSFS_H */

1
drivers/base/firmware_loader/sysfs_upload.c
View File

@ -4,7 +4,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include "sysfs.h"
#include "sysfs_upload.h" #include "sysfs_upload.h"
/* /*

23
drivers/base/firmware_loader/sysfs_upload.h
View File

@ -1,9 +1,11 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
#ifndef __FIRMWARE_UPLOAD_H #ifndef __SYSFS_UPLOAD_H
#define __FIRMWARE_UPLOAD_H #define __SYSFS_UPLOAD_H
#include <linux/device.h> #include <linux/device.h>
#include "sysfs.h"
/** /**
* enum fw_upload_prog - firmware upload progress codes * enum fw_upload_prog - firmware upload progress codes
* @FW_UPLOAD_PROG_IDLE: there is no firmware upload in progress * @FW_UPLOAD_PROG_IDLE: there is no firmware upload in progress
@ -36,19 +38,4 @@ struct fw_upload_priv {
enum fw_upload_err err_code; /* security manager error code */ enum fw_upload_err err_code; /* security manager error code */
}; };
#ifdef CONFIG_FW_UPLOAD #endif /* __SYSFS_UPLOAD_H */
extern struct device_attribute dev_attr_status;
extern struct device_attribute dev_attr_error;
extern struct device_attribute dev_attr_cancel;
extern struct device_attribute dev_attr_remaining_size;
int fw_upload_start(struct fw_sysfs *fw_sysfs);
umode_t fw_upload_is_visible(struct kobject *kobj, struct attribute *attr, int n);
#else
static inline int fw_upload_start(struct fw_sysfs *fw_sysfs)
{
return 0;
}
#endif
#endif /* __FIRMWARE_UPLOAD_H */