tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds a8a0e2a9 749f0461

+11 -25
+2 -2
Documentation/filesystems/debugfs.rst
··· 79 79 struct dentry *parent, u8 *value); 80 80 void debugfs_create_u16(const char *name, umode_t mode, 81 81 struct dentry *parent, u16 *value); 82 - struct dentry *debugfs_create_u32(const char *name, umode_t mode, 83 - struct dentry *parent, u32 *value); 82 + void debugfs_create_u32(const char *name, umode_t mode, 83 + struct dentry *parent, u32 *value); 84 84 void debugfs_create_u64(const char *name, umode_t mode, 85 85 struct dentry *parent, u64 *value); 86 86
-1
drivers/base/firmware_loader/fallback_table.c
··· 45 45 }, 46 46 { } 47 47 }; 48 - EXPORT_SYMBOL_GPL(firmware_config_table); 49 48 #endif
+2 -2
drivers/firmware/imx/Kconfig
··· 12 12 13 13 config IMX_SCU 14 14 bool "IMX SCU Protocol driver" 15 - depends on IMX_MBOX || COMPILE_TEST 15 + depends on IMX_MBOX 16 16 help 17 17 The System Controller Firmware (SCFW) is a low-level system function 18 18 which runs on a dedicated Cortex-M core to provide power, clock, and ··· 24 24 25 25 config IMX_SCU_PD 26 26 bool "IMX SCU Power Domain driver" 27 - depends on IMX_SCU || COMPILE_TEST 27 + depends on IMX_SCU 28 28 help 29 29 The System Controller Firmware (SCFW) based power domain driver.
+3 -12
fs/debugfs/file.c
··· 506 506 * This function creates a file in debugfs with the given name that 507 507 * contains the value of the variable @value. If the @mode variable is so 508 508 * set, it can be read from, and written to. 509 - * 510 - * This function will return a pointer to a dentry if it succeeds. This 511 - * pointer must be passed to the debugfs_remove() function when the file is 512 - * to be removed (no automatic cleanup happens if your module is unloaded, 513 - * you are responsible here.) If an error occurs, ERR_PTR(-ERROR) will be 514 - * returned. 515 - * 516 - * If debugfs is not enabled in the kernel, the value ERR_PTR(-ENODEV) will 517 - * be returned. 518 509 */ 519 - struct dentry *debugfs_create_u32(const char *name, umode_t mode, 520 - struct dentry *parent, u32 *value) 510 + void debugfs_create_u32(const char *name, umode_t mode, struct dentry *parent, 511 + u32 *value) 521 512 { 522 - return debugfs_create_mode_unsafe(name, mode, parent, value, &fops_u32, 513 + debugfs_create_mode_unsafe(name, mode, parent, value, &fops_u32, 523 514 &fops_u32_ro, &fops_u32_wo); 524 515 } 525 516 EXPORT_SYMBOL_GPL(debugfs_create_u32);
+4 -8
include/linux/debugfs.h
··· 103 103 u8 *value); 104 104 void debugfs_create_u16(const char *name, umode_t mode, struct dentry *parent, 105 105 u16 *value); 106 - struct dentry *debugfs_create_u32(const char *name, umode_t mode, 107 - struct dentry *parent, u32 *value); 106 + void debugfs_create_u32(const char *name, umode_t mode, struct dentry *parent, 107 + u32 *value); 108 108 void debugfs_create_u64(const char *name, umode_t mode, struct dentry *parent, 109 109 u64 *value); 110 110 struct dentry *debugfs_create_ulong(const char *name, umode_t mode, ··· 250 250 static inline void debugfs_create_u16(const char *name, umode_t mode, 251 251 struct dentry *parent, u16 *value) { } 252 252 253 - static inline struct dentry *debugfs_create_u32(const char *name, umode_t mode, 254 - struct dentry *parent, 255 - u32 *value) 256 - { 257 - return ERR_PTR(-ENODEV); 258 - } 253 + static inline void debugfs_create_u32(const char *name, umode_t mode, 254 + struct dentry *parent, u32 *value) { } 259 255 260 256 static inline void debugfs_create_u64(const char *name, umode_t mode, 261 257 struct dentry *parent, u64 *value) { }