Skip to content

Commit d3583f0

Browse files
committed
Revert "devtmpfs: remove return value of devtmpfs_delete_node()"
This reverts commit 9d3fe6a 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>
1 parent 2bc1906 commit d3583f0

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

drivers/base/base.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,10 +215,10 @@ void device_pm_move_to_tail(struct device *dev);
215215

216216
#ifdef CONFIG_DEVTMPFS
217217
int devtmpfs_create_node(struct device *dev);
218-
void devtmpfs_delete_node(struct device *dev);
218+
int devtmpfs_delete_node(struct device *dev);
219219
#else
220220
static inline int devtmpfs_create_node(struct device *dev) { return 0; }
221-
static inline void devtmpfs_delete_node(struct device *dev) { }
221+
static inline int devtmpfs_delete_node(struct device *dev) { return 0; }
222222
#endif
223223

224224
void software_node_notify(struct device *dev);

drivers/base/devtmpfs.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,22 +147,22 @@ int devtmpfs_create_node(struct device *dev)
147147
return devtmpfs_submit_req(&req, tmp);
148148
}
149149

150-
void devtmpfs_delete_node(struct device *dev)
150+
int devtmpfs_delete_node(struct device *dev)
151151
{
152152
const char *tmp = NULL;
153153
struct req req;
154154

155155
if (!thread)
156-
return;
156+
return 0;
157157

158158
req.name = device_get_devnode(dev, NULL, NULL, NULL, &tmp);
159159
if (!req.name)
160-
return;
160+
return -ENOMEM;
161161

162162
req.mode = 0;
163163
req.dev = dev;
164164

165-
devtmpfs_submit_req(&req, tmp);
165+
return devtmpfs_submit_req(&req, tmp);
166166
}
167167

168168
static int dev_mkdir(const char *name, umode_t mode)

0 commit comments

Comments
 (0)