Commit d3583f06 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "devtmpfs: remove return value of devtmpfs_delete_node()" 

This reverts commit 9d3fe6aa as it is
reported to cause boot regressions.

Link: https://lore.kernel.org/r/Y+rSXg14z1Myd8Px@dev-arch.thelio-3990X


Reported-by: default avatarNathan Chancellor <nathan@kernel.org>
Cc: Longlong Xia <xialonglong1@huawei.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2bc19066

drivers/base/base.h

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/base/devtmpfs.c

+4 −4
Original line number Diff line number Diff line
@@ -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)