From dfa632402964c86c1ade2e56167fe06790f0191d Mon Sep 17 00:00:00 2001
From: Ian Abbott <abbotti@mev.co.uk>
Date: Fri, 1 Feb 2013 13:23:19 +0000
Subject: [PATCH] --- yaml --- r: 354342 b: refs/heads/master c:
 da71751177f35f0ca5494968cc237511c423a744 h: refs/heads/master v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/staging/comedi/comedidev.h |  9 +--------
 trunk/drivers/staging/comedi/drivers.c   | 10 ++++++++++
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 45853ea6d0aa..c8b16111a9b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f65cc5447eaea9f7be1ff54e27c9658a66c5910f
+refs/heads/master: da71751177f35f0ca5494968cc237511c423a744
diff --git a/trunk/drivers/staging/comedi/comedidev.h b/trunk/drivers/staging/comedi/comedidev.h
index 484321d546dd..1502fc4a85fc 100644
--- a/trunk/drivers/staging/comedi/comedidev.h
+++ b/trunk/drivers/staging/comedi/comedidev.h
@@ -324,14 +324,7 @@ static inline unsigned int bytes_per_sample(const struct comedi_subdevice *subd)
  * known bus type.  Set automatically for auto-configured devices.
  * Automatically set to NULL when detaching hardware device.
  */
-static inline void comedi_set_hw_dev(struct comedi_device *dev,
-				     struct device *hw_dev)
-{
-	struct device *old_hw_dev = dev->hw_dev;
-
-	dev->hw_dev = get_device(hw_dev);
-	put_device(old_hw_dev);
-}
+int comedi_set_hw_dev(struct comedi_device *dev, struct device *hw_dev);
 
 unsigned int comedi_buf_write_alloc(struct comedi_async *, unsigned int);
 unsigned int comedi_buf_write_free(struct comedi_async *, unsigned int);
diff --git a/trunk/drivers/staging/comedi/drivers.c b/trunk/drivers/staging/comedi/drivers.c
index cc6240aa5790..5adf9fc45de4 100644
--- a/trunk/drivers/staging/comedi/drivers.c
+++ b/trunk/drivers/staging/comedi/drivers.c
@@ -43,6 +43,16 @@
 
 struct comedi_driver *comedi_drivers;
 
+int comedi_set_hw_dev(struct comedi_device *dev, struct device *hw_dev)
+{
+	struct device *old_hw_dev = dev->hw_dev;
+
+	dev->hw_dev = get_device(hw_dev);
+	put_device(old_hw_dev);
+	return 0;
+}
+EXPORT_SYMBOL_GPL(comedi_set_hw_dev);
+
 int comedi_alloc_subdevices(struct comedi_device *dev, int num_subdevices)
 {
 	struct comedi_subdevice *s;