Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66600221 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] proc_mkdir() should be used to create procfs directories 



A bunch of create_proc_dir_entry() calls creating directories had crept
in since the last sweep; converted to proc_mkdir().

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ecba97d4

drivers/char/drm/drm_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ static int __init drm_core_init(void) 
		goto err_p2;

	}



	drm_proc_root = create_proc_entry("dri", S_IFDIR, NULL);

	drm_proc_root = proc_mkdir("dri", NULL);

	if (!drm_proc_root) {

		DRM_ERROR("Cannot create /proc/dri\n");

		ret = -1;

drivers/char/drm/drm_proc.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ int drm_proc_init(drm_device_t *dev, int minor, 
	char                  name[64];



	sprintf(name, "%d", minor);

	*dev_root = create_proc_entry(name, S_IFDIR, root);

	*dev_root = proc_mkdir(name, root);

	if (!*dev_root) {

		DRM_ERROR("Cannot create /proc/dri/%s\n", name);

		return -1;

drivers/isdn/divert/divert_procfs.c

+3 −3
Original line number Diff line number Diff line
@@ -287,12 +287,12 @@ divert_dev_init(void) 
	init_waitqueue_head(&rd_queue);



#ifdef CONFIG_PROC_FS

	isdn_proc_entry = create_proc_entry("isdn", S_IFDIR | S_IRUGO | S_IXUGO, proc_net);

	isdn_proc_entry = proc_mkdir("net/isdn", NULL);

	if (!isdn_proc_entry)

		return (-1);

	isdn_divert_entry = create_proc_entry("divert", S_IFREG | S_IRUGO, isdn_proc_entry);

	if (!isdn_divert_entry) {

		remove_proc_entry("isdn", proc_net);

		remove_proc_entry("net/isdn", NULL);

		return (-1);

	}

	isdn_divert_entry->proc_fops = &isdn_fops;
@@ -312,7 +312,7 @@ divert_dev_deinit(void) 


#ifdef CONFIG_PROC_FS

	remove_proc_entry("divert", isdn_proc_entry);

	remove_proc_entry("isdn", proc_net);

	remove_proc_entry("net/isdn", NULL);

#endif	/* CONFIG_PROC_FS */



	return (0);

drivers/isdn/hardware/eicon/diva_didd.c

+2 −4
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ static char *DRIVERNAME = 
static char *DRIVERLNAME = "divadidd";

char *DRIVERRELEASE_DIDD = "2.0";



static char *main_proc_dir = "eicon";



MODULE_DESCRIPTION("DIDD table driver for diva drivers");

MODULE_AUTHOR("Cytronics & Melware, Eicon Networks");

MODULE_SUPPORTED_DEVICE("Eicon diva drivers");
@@ -89,7 +87,7 @@ proc_read(char *page, char **start, off_t off, int count, int *eof, 


static int DIVA_INIT_FUNCTION create_proc(void)

{

	proc_net_eicon = create_proc_entry(main_proc_dir, S_IFDIR, proc_net);

	proc_net_eicon = proc_mkdir("net/eicon", NULL);



	if (proc_net_eicon) {

		if ((proc_didd =
@@ -105,7 +103,7 @@ static int DIVA_INIT_FUNCTION create_proc(void) 
static void DIVA_EXIT_FUNCTION remove_proc(void)

{

	remove_proc_entry(DRIVERLNAME, proc_net_eicon);

	remove_proc_entry(main_proc_dir, proc_net);

	remove_proc_entry("net/eicon", NULL);

}



static int DIVA_INIT_FUNCTION divadidd_init(void)

drivers/isdn/hardware/eicon/divasproc.c

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ int create_adapter_proc(diva_os_xdi_adapter_t * a) 
	char tmp[16];



	sprintf(tmp, "%s%d", adapter_dir_name, a->controller);

	if (!(de = create_proc_entry(tmp, S_IFDIR, proc_net_eicon)))

	if (!(de = proc_mkdir(tmp, proc_net_eicon)))

		return (0);

	a->proc_adapter_dir = (void *) de;