mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 23:27:06 +00:00
Revert "devtmpfs: remove return value of devtmpfs_delete_node()"
This reverts commit 9d3fe6aa6b
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>
This commit is contained in:
parent
2bc19066bd
commit
d3583f0678
2 changed files with 6 additions and 6 deletions
|
@ -215,10 +215,10 @@ void device_pm_move_to_tail(struct device *dev);
|
||||||
|
|
||||||
#ifdef CONFIG_DEVTMPFS
|
#ifdef CONFIG_DEVTMPFS
|
||||||
int devtmpfs_create_node(struct device *dev);
|
int devtmpfs_create_node(struct device *dev);
|
||||||
void devtmpfs_delete_node(struct device *dev);
|
int devtmpfs_delete_node(struct device *dev);
|
||||||
#else
|
#else
|
||||||
static inline int devtmpfs_create_node(struct device *dev) { return 0; }
|
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
|
#endif
|
||||||
|
|
||||||
void software_node_notify(struct device *dev);
|
void software_node_notify(struct device *dev);
|
||||||
|
|
|
@ -147,22 +147,22 @@ int devtmpfs_create_node(struct device *dev)
|
||||||
return devtmpfs_submit_req(&req, tmp);
|
return devtmpfs_submit_req(&req, tmp);
|
||||||
}
|
}
|
||||||
|
|
||||||
void devtmpfs_delete_node(struct device *dev)
|
int devtmpfs_delete_node(struct device *dev)
|
||||||
{
|
{
|
||||||
const char *tmp = NULL;
|
const char *tmp = NULL;
|
||||||
struct req req;
|
struct req req;
|
||||||
|
|
||||||
if (!thread)
|
if (!thread)
|
||||||
return;
|
return 0;
|
||||||
|
|
||||||
req.name = device_get_devnode(dev, NULL, NULL, NULL, &tmp);
|
req.name = device_get_devnode(dev, NULL, NULL, NULL, &tmp);
|
||||||
if (!req.name)
|
if (!req.name)
|
||||||
return;
|
return -ENOMEM;
|
||||||
|
|
||||||
req.mode = 0;
|
req.mode = 0;
|
||||||
req.dev = dev;
|
req.dev = dev;
|
||||||
|
|
||||||
devtmpfs_submit_req(&req, tmp);
|
return devtmpfs_submit_req(&req, tmp);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int dev_mkdir(const char *name, umode_t mode)
|
static int dev_mkdir(const char *name, umode_t mode)
|
||||||
|
|
Loading…
Reference in a new issue