staging:iio: Fix compile error without CONFIG_DEBUG_FS
authorLars-Peter Clausen <lars@metafoo.de>
Tue, 6 Mar 2012 19:43:45 +0000 (20:43 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 7 Mar 2012 21:26:52 +0000 (13:26 -0800)
commit e553f182d ("staging: iio: core: Introduce debugfs support, add support
for direct register access") added a '#if defined(CONFIG_DEBUG_FS)' around
iio_read_channel_ext_info and iio_write_channel_ext_info causing the following
compile error if CONFIG_DEBUG_FS is not defined.

drivers/staging/iio/industrialio-core.c:621:11: error: 'iio_read_channel_ext_info' undeclared (first use in this function)
drivers/staging/iio/industrialio-core.c:623:11: error: 'iio_write_channel_ext_info' undeclared (first use in this function)

This patch fixes the issue by moving the functions out of the '#if
defined(CONFIG_DEBUG_FS)' section again.

Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/iio/industrialio-core.c

index 27695dffb17786fe0730e882b8f3ad714014b36e..d303bfbff27fb669b6efc83f86f4b4f920977e8b 100644 (file)
@@ -227,33 +227,6 @@ static void iio_device_unregister_debugfs(struct iio_dev *indio_dev)
        debugfs_remove_recursive(indio_dev->debugfs_dentry);
 }
 
-static ssize_t iio_read_channel_ext_info(struct device *dev,
-                                    struct device_attribute *attr,
-                                    char *buf)
-{
-       struct iio_dev *indio_dev = dev_get_drvdata(dev);
-       struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
-       const struct iio_chan_spec_ext_info *ext_info;
-
-       ext_info = &this_attr->c->ext_info[this_attr->address];
-
-       return ext_info->read(indio_dev, this_attr->c, buf);
-}
-
-static ssize_t iio_write_channel_ext_info(struct device *dev,
-                                    struct device_attribute *attr,
-                                    const char *buf,
-                                        size_t len)
-{
-       struct iio_dev *indio_dev = dev_get_drvdata(dev);
-       struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
-       const struct iio_chan_spec_ext_info *ext_info;
-
-       ext_info = &this_attr->c->ext_info[this_attr->address];
-
-       return ext_info->write(indio_dev, this_attr->c, buf, len);
-}
-
 static int iio_device_register_debugfs(struct iio_dev *indio_dev)
 {
        struct dentry *d;
@@ -297,6 +270,33 @@ static void iio_device_unregister_debugfs(struct iio_dev *indio_dev)
 }
 #endif /* CONFIG_DEBUG_FS */
 
+static ssize_t iio_read_channel_ext_info(struct device *dev,
+                                    struct device_attribute *attr,
+                                    char *buf)
+{
+       struct iio_dev *indio_dev = dev_get_drvdata(dev);
+       struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+       const struct iio_chan_spec_ext_info *ext_info;
+
+       ext_info = &this_attr->c->ext_info[this_attr->address];
+
+       return ext_info->read(indio_dev, this_attr->c, buf);
+}
+
+static ssize_t iio_write_channel_ext_info(struct device *dev,
+                                    struct device_attribute *attr,
+                                    const char *buf,
+                                        size_t len)
+{
+       struct iio_dev *indio_dev = dev_get_drvdata(dev);
+       struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+       const struct iio_chan_spec_ext_info *ext_info;
+
+       ext_info = &this_attr->c->ext_info[this_attr->address];
+
+       return ext_info->write(indio_dev, this_attr->c, buf, len);
+}
+
 static ssize_t iio_read_channel_info(struct device *dev,
                                     struct device_attribute *attr,
                                     char *buf)