From 6863d44dc8020360b58a4b57fae2894d1844fe71 Mon Sep 17 00:00:00 2001
From: Jonathan Cameron <jic23@cam.ac.uk>
Date: Tue, 30 Aug 2011 12:41:08 +0100
Subject: [PATCH] --- yaml --- r: 268150 b: refs/heads/master c:
 9019309c2f32a4479c88047532552bdeea38585a h: refs/heads/master v: v3

---
 [refs]                                          |  2 +-
 trunk/drivers/staging/iio/iio_core.h            | 10 ----------
 trunk/drivers/staging/iio/industrialio-core.c   | 17 +----------------
 .../drivers/staging/iio/industrialio-trigger.c  |  2 --
 4 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/[refs] b/[refs]
index e353e7b73ffa..d4e079de7157 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47c24fdd4253a2c8d730b978a186923b1af5e879
+refs/heads/master: 9019309c2f32a4479c88047532552bdeea38585a
diff --git a/trunk/drivers/staging/iio/iio_core.h b/trunk/drivers/staging/iio/iio_core.h
index 433952bb843a..edc295efc37c 100644
--- a/trunk/drivers/staging/iio/iio_core.h
+++ b/trunk/drivers/staging/iio/iio_core.h
@@ -13,16 +13,6 @@
 #ifndef _IIO_CORE_H_
 #define _IIO_CORE_H_
 
-/**
- * iio_put() - internal module reference count reduce
- **/
-void iio_put(void);
-
-/**
- * iio_get() - internal module reference count increase
- **/
-void iio_get(void);
-
 int __iio_add_chan_devattr(const char *postfix,
 			   const char *group,
 			   struct iio_chan_spec const *chan,
diff --git a/trunk/drivers/staging/iio/industrialio-core.c b/trunk/drivers/staging/iio/industrialio-core.c
index 13f8c820f50e..8b8e1fb5eda0 100644
--- a/trunk/drivers/staging/iio/industrialio-core.c
+++ b/trunk/drivers/staging/iio/industrialio-core.c
@@ -1018,7 +1018,6 @@ static void iio_dev_release(struct device *device)
 {
 	struct iio_dev *dev_info = container_of(device, struct iio_dev, dev);
 	cdev_del(&dev_info->chrdev);
-	iio_put();
 	kfree(dev_info);
 }
 
@@ -1048,7 +1047,6 @@ struct iio_dev *iio_allocate_device(int sizeof_priv)
 		device_initialize(&dev->dev);
 		dev_set_drvdata(&dev->dev, (void *)dev);
 		mutex_init(&dev->mlock);
-		iio_get();
 	}
 
 	return dev;
@@ -1057,10 +1055,8 @@ EXPORT_SYMBOL(iio_allocate_device);
 
 void iio_free_device(struct iio_dev *dev)
 {
-	if (dev) {
-		iio_put();
+	if (dev)
 		kfree(dev);
-	}
 }
 EXPORT_SYMBOL(iio_free_device);
 
@@ -1173,17 +1169,6 @@ void iio_device_unregister(struct iio_dev *dev_info)
 	device_unregister(&dev_info->dev);
 }
 EXPORT_SYMBOL(iio_device_unregister);
-
-void iio_put(void)
-{
-	module_put(THIS_MODULE);
-}
-
-void iio_get(void)
-{
-	__module_get(THIS_MODULE);
-}
-
 subsys_initcall(iio_init);
 module_exit(iio_exit);
 
diff --git a/trunk/drivers/staging/iio/industrialio-trigger.c b/trunk/drivers/staging/iio/industrialio-trigger.c
index b99d14e49e57..3e60406d8f65 100644
--- a/trunk/drivers/staging/iio/industrialio-trigger.c
+++ b/trunk/drivers/staging/iio/industrialio-trigger.c
@@ -394,7 +394,6 @@ static void iio_trig_release(struct device *device)
 	}
 	kfree(trig->name);
 	kfree(trig);
-	iio_put();
 }
 
 static struct device_type iio_trig_type = {
@@ -461,7 +460,6 @@ struct iio_trigger *iio_allocate_trigger(const char *fmt, ...)
 					  IRQ_NOREQUEST | IRQ_NOAUTOEN,
 					  IRQ_NOPROBE);
 		}
-		iio_get();
 		get_device(&trig->dev);
 	}
 	return trig;