aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-07-24 02:07:46 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-07-24 10:12:33 -0400
commite55d92b92d240189241c22bfdfc885d4225a4d61 (patch)
treef29095ec817db02a1e40349b0c6b136e0172e2b4
parente772aed369779c98f44e83ccd7fb1b713953cd09 (diff)
get rid of create_proc_entry() abuses - proc_mkdir() is there for purpose
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--arch/arm/mach-bcmring/dma.c2
-rw-r--r--drivers/staging/rtl8187se/r8180_core.c2
-rw-r--r--drivers/staging/rtl8192e/ieee80211/ieee80211_module.c2
-rw-r--r--drivers/staging/rtl8192e/r8192E_core.c6
-rw-r--r--drivers/staging/rtl8192u/ieee80211/ieee80211_module.c2
-rw-r--r--drivers/staging/rtl8192u/r8192U_core.c6
-rw-r--r--sound/core/info.c2
7 files changed, 9 insertions, 13 deletions
diff --git a/arch/arm/mach-bcmring/dma.c b/arch/arm/mach-bcmring/dma.c
index d87ad30dda3..9f2a948e0e7 100644
--- a/arch/arm/mach-bcmring/dma.c
+++ b/arch/arm/mach-bcmring/dma.c
@@ -835,7 +835,7 @@ int dma_init(void)
835 835
836 /* Create /proc/dma/channels and /proc/dma/devices */ 836 /* Create /proc/dma/channels and /proc/dma/devices */
837 837
838 gDmaDir = create_proc_entry("dma", S_IFDIR | S_IRUGO | S_IXUGO, NULL); 838 gDmaDir = proc_mkdir("dma", NULL);
839 839
840 if (gDmaDir == NULL) { 840 if (gDmaDir == NULL) {
841 printk(KERN_ERR "Unable to create /proc/dma\n"); 841 printk(KERN_ERR "Unable to create /proc/dma\n");
diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
index bae7d85fe83..4c6651aac30 100644
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@ -307,7 +307,7 @@ static int proc_get_stats_tx(char *page, char **start,
307void rtl8180_proc_module_init(void) 307void rtl8180_proc_module_init(void)
308{ 308{
309 DMESG("Initializing proc filesystem"); 309 DMESG("Initializing proc filesystem");
310 rtl8180_proc = create_proc_entry(RTL8180_MODULE_NAME, S_IFDIR, init_net.proc_net); 310 rtl8180_proc = proc_mkdir(RTL8180_MODULE_NAME, init_net.proc_net);
311} 311}
312 312
313void rtl8180_proc_module_remove(void) 313void rtl8180_proc_module_remove(void)
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c
index 663b0b8e109..c2901b50dbf 100644
--- a/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c
+++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c
@@ -311,7 +311,7 @@ int __init ieee80211_rtl_init(void)
311 } 311 }
312 312
313 ieee80211_debug_level = debug; 313 ieee80211_debug_level = debug;
314 ieee80211_proc = create_proc_entry(DRV_NAME, S_IFDIR, init_net.proc_net); 314 ieee80211_proc = proc_mkdir(DRV_NAME, init_net.proc_net);
315 if (ieee80211_proc == NULL) { 315 if (ieee80211_proc == NULL) {
316 IEEE80211_ERROR("Unable to create " DRV_NAME 316 IEEE80211_ERROR("Unable to create " DRV_NAME
317 " proc directory\n"); 317 " proc directory\n");
diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c
index 19a9a07224a..8550794c6b9 100644
--- a/drivers/staging/rtl8192e/r8192E_core.c
+++ b/drivers/staging/rtl8192e/r8192E_core.c
@@ -508,7 +508,7 @@ static int proc_get_stats_rx(char *page, char **start,
508static void rtl8192_proc_module_init(void) 508static void rtl8192_proc_module_init(void)
509{ 509{
510 RT_TRACE(COMP_INIT, "Initializing proc filesystem\n"); 510 RT_TRACE(COMP_INIT, "Initializing proc filesystem\n");
511 rtl8192_proc=create_proc_entry(RTL819xE_MODULE_NAME, S_IFDIR, init_net.proc_net); 511 rtl8192_proc = proc_mkdir(RTL819xE_MODULE_NAME, init_net.proc_net);
512} 512}
513 513
514 514
@@ -540,9 +540,7 @@ static void rtl8192_proc_init_one(struct r8192_priv *priv)
540 struct net_device *dev = priv->ieee80211->dev; 540 struct net_device *dev = priv->ieee80211->dev;
541 struct proc_dir_entry *e; 541 struct proc_dir_entry *e;
542 542
543 priv->dir_dev = create_proc_entry(dev->name, 543 priv->dir_dev = proc_mkdir(dev->name, rtl8192_proc);
544 S_IFDIR | S_IRUGO | S_IXUGO,
545 rtl8192_proc);
546 if (!priv->dir_dev) { 544 if (!priv->dir_dev) {
547 RT_TRACE(COMP_ERR, "Unable to initialize /proc/net/rtl8192/%s\n", 545 RT_TRACE(COMP_ERR, "Unable to initialize /proc/net/rtl8192/%s\n",
548 dev->name); 546 dev->name);
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
index fe978f359f9..d315b256b7a 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
@@ -283,7 +283,7 @@ int __init ieee80211_debug_init(void)
283 283
284 ieee80211_debug_level = debug; 284 ieee80211_debug_level = debug;
285 285
286 ieee80211_proc = create_proc_entry(DRV_NAME, S_IFDIR, init_net.proc_net); 286 ieee80211_proc = proc_mkdir(DRV_NAME, init_net.proc_net);
287 if (ieee80211_proc == NULL) { 287 if (ieee80211_proc == NULL) {
288 IEEE80211_ERROR("Unable to create " DRV_NAME 288 IEEE80211_ERROR("Unable to create " DRV_NAME
289 " proc directory\n"); 289 " proc directory\n");
diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
index e81b8ab6aa9..6a1b5c17902 100644
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -671,7 +671,7 @@ static int proc_get_stats_rx(char *page, char **start,
671void rtl8192_proc_module_init(void) 671void rtl8192_proc_module_init(void)
672{ 672{
673 RT_TRACE(COMP_INIT, "Initializing proc filesystem"); 673 RT_TRACE(COMP_INIT, "Initializing proc filesystem");
674 rtl8192_proc=create_proc_entry(RTL819xU_MODULE_NAME, S_IFDIR, init_net.proc_net); 674 rtl8192_proc = proc_mkdir(RTL819xU_MODULE_NAME, init_net.proc_net);
675} 675}
676 676
677 677
@@ -706,9 +706,7 @@ void rtl8192_proc_init_one(struct net_device *dev)
706{ 706{
707 struct proc_dir_entry *e; 707 struct proc_dir_entry *e;
708 struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev); 708 struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
709 priv->dir_dev = create_proc_entry(dev->name, 709 priv->dir_dev = proc_mkdir(dev->name, rtl8192_proc);
710 S_IFDIR | S_IRUGO | S_IXUGO,
711 rtl8192_proc);
712 if (!priv->dir_dev) { 710 if (!priv->dir_dev) {
713 RT_TRACE(COMP_ERR, "Unable to initialize /proc/net/rtl8192/%s\n", 711 RT_TRACE(COMP_ERR, "Unable to initialize /proc/net/rtl8192/%s\n",
714 dev->name); 712 dev->name);
diff --git a/sound/core/info.c b/sound/core/info.c
index 7077f601da5..601f0ebb677 100644
--- a/sound/core/info.c
+++ b/sound/core/info.c
@@ -531,7 +531,7 @@ int __init snd_info_init(void)
531{ 531{
532 struct proc_dir_entry *p; 532 struct proc_dir_entry *p;
533 533
534 p = create_proc_entry("asound", S_IFDIR | S_IRUGO | S_IXUGO, NULL); 534 p = proc_mkdir("asound", NULL);
535 if (p == NULL) 535 if (p == NULL)
536 return -ENOMEM; 536 return -ENOMEM;
537 snd_proc_root = p; 537 snd_proc_root = p;