diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-14 08:59:13 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-14 09:01:21 +0100 |
| commit | d3583f06782cae72374464f9c29b2056fa0bd012 (patch) | |
| tree | fcaf5948b9c3dbd37b7db60b11c0cdab3e77777b /drivers/base | |
| parent | 2bc19066bda340540468ff88c2b1a798983bfd28 (diff) | |
Revert "devtmpfs: remove return value of devtmpfs_delete_node()"
This reverts commit 9d3fe6aa6b9517408064c7c3134187e8ec77dbf7 as it is
reported to cause boot regressions.
Link: https://lore.kernel.org/r/Y+rSXg14z1Myd8Px@dev-arch.thelio-3990X
Reported-by: Nathan Chancellor <nathan@kernel.org>
Cc: Longlong Xia <xialonglong1@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/base.h | 4 | ||||
| -rw-r--r-- | drivers/base/devtmpfs.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/base/base.h b/drivers/base/base.h index 80cdf3fcb458..726a12a244c0 100644 --- a/drivers/base/base.h +++ b/drivers/base/base.h @@ -215,10 +215,10 @@ void device_pm_move_to_tail(struct device *dev); #ifdef CONFIG_DEVTMPFS int devtmpfs_create_node(struct device *dev); -void devtmpfs_delete_node(struct device *dev); +int devtmpfs_delete_node(struct device *dev); #else static inline int devtmpfs_create_node(struct device *dev) { return 0; } -static inline void devtmpfs_delete_node(struct device *dev) { } +static inline int devtmpfs_delete_node(struct device *dev) { return 0; } #endif void software_node_notify(struct device *dev); diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c index a3a2657b9587..f273bccd5494 100644 --- a/drivers/base/devtmpfs.c +++ b/drivers/base/devtmpfs.c @@ -147,22 +147,22 @@ int devtmpfs_create_node(struct device *dev) return devtmpfs_submit_req(&req, tmp); } -void devtmpfs_delete_node(struct device *dev) +int devtmpfs_delete_node(struct device *dev) { const char *tmp = NULL; struct req req; if (!thread) - return; + return 0; req.name = device_get_devnode(dev, NULL, NULL, NULL, &tmp); if (!req.name) - return; + return -ENOMEM; req.mode = 0; req.dev = dev; - devtmpfs_submit_req(&req, tmp); + return devtmpfs_submit_req(&req, tmp); } static int dev_mkdir(const char *name, umode_t mode) |