Commit a8a0e2a9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-5.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 

Pull driver core fixes from Greg KH:
 "Here are some small firmware/driver core/debugfs fixes for 5.7-rc3.

  The debugfs change is now possible as now the last users of
  debugfs_create_u32() have been fixed up in the different trees that
  got merged into 5.7-rc1, and I don't want it creeping back in.

  The firmware changes did cause a regression in linux-next, so the
  final patch here reverts part of that, re-exporting the symbol to
  resolve that issue. All of these patches, with the exception of the
  final one, have been in linux-next with only that one reported issue"

* tag 'driver-core-5.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  firmware_loader: revert removal of the fw_fallback_config export
  debugfs: remove return value of debugfs_create_u32()
  firmware_loader: remove unused exports
  firmware: imx: fix compile-testing
parents 749f0461 5a357703

Documentation/filesystems/debugfs.rst

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ created with any of:: 
			   struct dentry *parent, u8 *value);

    void debugfs_create_u16(const char *name, umode_t mode,

			    struct dentry *parent, u16 *value);

    struct dentry *debugfs_create_u32(const char *name, umode_t mode,

    void debugfs_create_u32(const char *name, umode_t mode,

			    struct dentry *parent, u32 *value);

    void debugfs_create_u64(const char *name, umode_t mode,

			    struct dentry *parent, u64 *value);

drivers/base/firmware_loader/fallback_table.c

+0 −1
Original line number Diff line number Diff line
@@ -45,5 +45,4 @@ struct ctl_table firmware_config_table[] = { 
	},

	{ }

};

EXPORT_SYMBOL_GPL(firmware_config_table);

#endif

drivers/firmware/imx/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ config IMX_DSP 


config IMX_SCU

	bool "IMX SCU Protocol driver"

	depends on IMX_MBOX || COMPILE_TEST

	depends on IMX_MBOX

	help

	  The System Controller Firmware (SCFW) is a low-level system function

	  which runs on a dedicated Cortex-M core to provide power, clock, and
@@ -24,6 +24,6 @@ config IMX_SCU 


config IMX_SCU_PD

	bool "IMX SCU Power Domain driver"

	depends on IMX_SCU || COMPILE_TEST

	depends on IMX_SCU

	help

	  The System Controller Firmware (SCFW) based power domain driver.

fs/debugfs/file.c

+3 −12
Original line number Diff line number Diff line
@@ -506,20 +506,11 @@ DEFINE_DEBUGFS_ATTRIBUTE(fops_u32_wo, NULL, debugfs_u32_set, "%llu\n"); 
 * This function creates a file in debugfs with the given name that

 * contains the value of the variable @value.  If the @mode variable is so

 * set, it can be read from, and written to.

 *

 * This function will return a pointer to a dentry if it succeeds.  This

 * pointer must be passed to the debugfs_remove() function when the file is

 * to be removed (no automatic cleanup happens if your module is unloaded,

 * you are responsible here.)  If an error occurs, ERR_PTR(-ERROR) will be

 * returned.

 *

 * If debugfs is not enabled in the kernel, the value ERR_PTR(-ENODEV) will

 * be returned.

 */

struct dentry *debugfs_create_u32(const char *name, umode_t mode,

				 struct dentry *parent, u32 *value)

void debugfs_create_u32(const char *name, umode_t mode, struct dentry *parent,

			u32 *value)

{

	return debugfs_create_mode_unsafe(name, mode, parent, value, &fops_u32,

	debugfs_create_mode_unsafe(name, mode, parent, value, &fops_u32,

				   &fops_u32_ro, &fops_u32_wo);

}

EXPORT_SYMBOL_GPL(debugfs_create_u32);

include/linux/debugfs.h

+4 −8
Original line number Diff line number Diff line
@@ -103,8 +103,8 @@ void debugfs_create_u8(const char *name, umode_t mode, struct dentry *parent, 
		       u8 *value);

void debugfs_create_u16(const char *name, umode_t mode, struct dentry *parent,

			u16 *value);

struct dentry *debugfs_create_u32(const char *name, umode_t mode,

				  struct dentry *parent, u32 *value);

void debugfs_create_u32(const char *name, umode_t mode, struct dentry *parent,

			u32 *value);

void debugfs_create_u64(const char *name, umode_t mode, struct dentry *parent,

			u64 *value);

struct dentry *debugfs_create_ulong(const char *name, umode_t mode,
@@ -250,12 +250,8 @@ static inline void debugfs_create_u8(const char *name, umode_t mode, 
static inline void debugfs_create_u16(const char *name, umode_t mode,

				      struct dentry *parent, u16 *value) { }



static inline struct dentry *debugfs_create_u32(const char *name, umode_t mode,

						struct dentry *parent,

						u32 *value)

{

	return ERR_PTR(-ENODEV);

}

static inline void debugfs_create_u32(const char *name, umode_t mode,

				      struct dentry *parent, u32 *value) { }



static inline void debugfs_create_u64(const char *name, umode_t mode,

				      struct dentry *parent, u64 *value) { }

CRA Git | Maintained and supported by SUSTech CRA and CCSE