From 7d464ed4c51b7a4f9b0ef292dee22c73950a7332 Mon Sep 17 00:00:00 2001
From: Chas Williams <chas@cmf.nrl.navy.mil>
Date: Thu, 4 Sep 2003 12:41:05 -0700
Subject: [PATCH] [ATM]: reduce CONFIG_PROC_FS #ifdef clutter in .c code (from
 levon@movementarian.org)

---
 net/atm/common.c    |  4 ----
 net/atm/common.h    | 13 +++++++++++++
 net/atm/proc.c      |  7 +++++++
 net/atm/resources.c | 28 +++++++++++-----------------
 net/atm/resources.h | 14 +++++++++++++-
 5 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/net/atm/common.c b/net/atm/common.c
index 72080c62e5352..62c8f0a72179a 100644
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -1114,12 +1114,10 @@ static int __init atm_init(void)
 		printk(KERN_ERR "atmsvc_init() failed with %d\n", error);
 		goto failure;
 	}
-#ifdef CONFIG_PROC_FS
         if ((error = atm_proc_init()) < 0) {
 		printk(KERN_ERR "atm_proc_init() failed with %d\n",error);
 		goto failure;
 	}
-#endif
 	return 0;
 
 failure:
@@ -1130,9 +1128,7 @@ failure:
 
 static void __exit atm_exit(void)
 {
-#ifdef CONFIG_PROC_FS
 	atm_proc_exit();
-#endif
 	atmsvc_exit();
 	atmpvc_exit();
 }
diff --git a/net/atm/common.h b/net/atm/common.h
index eb98c93574318..426f1fa8bbb1f 100644
--- a/net/atm/common.h
+++ b/net/atm/common.h
@@ -33,8 +33,21 @@ int atmpvc_init(void);
 void atmpvc_exit(void);
 int atmsvc_init(void);
 void atmsvc_exit(void);
+
+#ifdef CONFIG_PROC_FS
 int atm_proc_init(void);
 void atm_proc_exit(void);
+#else
+static inline int atm_proc_init(void)
+{
+	return 0;
+}
+
+static inline void atm_proc_exit(void)
+{
+	/* nothing */
+}
+#endif /* CONFIG_PROC_FS */
 
 /* SVC */
 
diff --git a/net/atm/proc.c b/net/atm/proc.c
index 05c41491b4312..d493ab2cd4203 100644
--- a/net/atm/proc.c
+++ b/net/atm/proc.c
@@ -593,6 +593,10 @@ int atm_proc_dev_register(struct atm_dev *dev)
 	int digits,num;
 	int error;
 
+	/* No proc info */
+	if (!dev->ops->proc_read)
+		return 0;
+
 	error = -ENOMEM;
 	digits = 0;
 	for (num = dev->number; num; num /= 10) digits++;
@@ -619,6 +623,9 @@ fail1:
 
 void atm_proc_dev_deregister(struct atm_dev *dev)
 {
+	if (!dev->ops->proc_read)
+		return;
+
 	remove_proc_entry(dev->proc_name, atm_proc_root);
 	kfree(dev->proc_name);
 }
diff --git a/net/atm/resources.c b/net/atm/resources.c
index ae3009c6eb4f1..bd32c0caabe4c 100644
--- a/net/atm/resources.c
+++ b/net/atm/resources.c
@@ -110,20 +110,16 @@ struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops,
 	list_add_tail(&dev->dev_list, &atm_devs);
 	spin_unlock(&atm_dev_lock);
 
-#ifdef CONFIG_PROC_FS
-	if (ops->proc_read) {
-		if (atm_proc_dev_register(dev) < 0) {
-			printk(KERN_ERR "atm_dev_register: "
-			       "atm_proc_dev_register failed for dev %s\n",
-			       type);
-			spin_lock(&atm_dev_lock);
-			list_del(&dev->dev_list);
-			spin_unlock(&atm_dev_lock);
-			__free_atm_dev(dev);
-			return NULL;
-		}
+	if (atm_proc_dev_register(dev) < 0) {
+		printk(KERN_ERR "atm_dev_register: "
+		       "atm_proc_dev_register failed for dev %s\n",
+		       type);
+		spin_lock(&atm_dev_lock);
+		list_del(&dev->dev_list);
+		spin_unlock(&atm_dev_lock);
+		__free_atm_dev(dev);
+		return NULL;
 	}
-#endif
 
 	return dev;
 }
@@ -133,10 +129,8 @@ void atm_dev_deregister(struct atm_dev *dev)
 {
 	unsigned long warning_time;
 
-#ifdef CONFIG_PROC_FS
-	if (dev->ops->proc_read)
-		atm_proc_dev_deregister(dev);
-#endif
+	atm_proc_dev_deregister(dev);
+
 	spin_lock(&atm_dev_lock);
 	list_del(&dev->dev_list);
 	spin_unlock(&atm_dev_lock);
diff --git a/net/atm/resources.h b/net/atm/resources.h
index c4ecc1be6a265..1b6bad8db9ccb 100644
--- a/net/atm/resources.h
+++ b/net/atm/resources.h
@@ -24,6 +24,18 @@ int atm_dev_ioctl(unsigned int cmd, unsigned long arg);
 int atm_proc_dev_register(struct atm_dev *dev);
 void atm_proc_dev_deregister(struct atm_dev *dev);
 
-#endif
+#else
+
+static inline int atm_proc_dev_register(struct atm_dev *dev)
+{
+	return 0;
+}
+
+static inline void atm_proc_dev_deregister(struct atm_dev *dev)
+{
+	/* nothing */
+}
+
+#endif /* CONFIG_PROC_FS */
 
 #endif
-- 
2.53.0