aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Longlong Xia <xialonglong1@huawei.com> 2023-02-10 09:54:44 +0000
committerGravatar Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2023-02-11 09:45:59 +0100
commit9d3fe6aa6b9517408064c7c3134187e8ec77dbf7 (patch)
tree227fec7d179e5574bb3e69f25ecbd43d1d58aa8f
parentdevtmpfs: add debug info to handle() (diff)
downloadlinux-9d3fe6aa6b9517408064c7c3134187e8ec77dbf7.tar.gz
linux-9d3fe6aa6b9517408064c7c3134187e8ec77dbf7.tar.bz2
linux-9d3fe6aa6b9517408064c7c3134187e8ec77dbf7.zip
devtmpfs: remove return value of devtmpfs_delete_node()
The only caller of device_del() does not check the return value. And there's nothing we can do when cleaning things up on a remove path. Let's make it a void function. Signed-off-by: Longlong Xia <xialonglong1@huawei.com> Link: https://lore.kernel.org/r/20230210095444.4067307-4-xialonglong1@huawei.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/base/base.h4
-rw-r--r--drivers/base/devtmpfs.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/base/base.h b/drivers/base/base.h
index 726a12a244c0..80cdf3fcb458 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);
-int devtmpfs_delete_node(struct device *dev);
+void devtmpfs_delete_node(struct device *dev);
#else
static inline int devtmpfs_create_node(struct device *dev) { return 0; }
-static inline int devtmpfs_delete_node(struct device *dev) { return 0; }
+static inline void devtmpfs_delete_node(struct device *dev) { }
#endif
void software_node_notify(struct device *dev);
diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
index f273bccd5494..a3a2657b9587 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);
}
-int devtmpfs_delete_node(struct device *dev)
+void devtmpfs_delete_node(struct device *dev)
{
const char *tmp = NULL;
struct req req;
if (!thread)
- return 0;
+ return;
req.name = device_get_devnode(dev, NULL, NULL, NULL, &tmp);
if (!req.name)
- return -ENOMEM;
+ return;
req.mode = 0;
req.dev = dev;
- return devtmpfs_submit_req(&req, tmp);
+ devtmpfs_submit_req(&req, tmp);
}
static int dev_mkdir(const char *name, umode_t mode)