summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Cameron <jic23@kernel.org>2015-12-05 16:23:26 +0000
committerJonathan Cameron <jic23@kernel.org>2015-12-05 16:25:30 +0000
commit8d6c16dd7213fa43702416e3dd1059e9e36bc758 (patch)
tree052abb1b36498fcd7229320368657128d316b99c
parent93e87d73cc46685902bffb0928c2514eaf209b44 (diff)
downloadlinux-stable-8d6c16dd7213fa43702416e3dd1059e9e36bc758.tar.gz
linux-stable-8d6c16dd7213fa43702416e3dd1059e9e36bc758.tar.bz2
linux-stable-8d6c16dd7213fa43702416e3dd1059e9e36bc758.zip
iio:configfs: Introduce iio/configfs.h to provide a location for the configfs_subsystem
This exported element needs to be accesible to all drivers using configfs within IIO. Previously it was in the sw_trig.h file which only convered one such usecase. This also fixes a sparse warning as it is now in a header that makes sense to include from industrialio-configfs.c Signed-off-by: Jonathan Cameron < jic23@kernel.org>
-rw-r--r--drivers/iio/industrialio-configfs.c1
-rw-r--r--drivers/iio/industrialio-sw-trigger.c1
-rw-r--r--include/linux/iio/configfs.h15
-rw-r--r--include/linux/iio/sw_trigger.h1
4 files changed, 17 insertions, 1 deletions
diff --git a/drivers/iio/industrialio-configfs.c b/drivers/iio/industrialio-configfs.c
index 83563dd7fcf4..45ce2bc47180 100644
--- a/drivers/iio/industrialio-configfs.c
+++ b/drivers/iio/industrialio-configfs.c
@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/iio/iio.h>
+#include <linux/iio/configfs.h>
static struct config_item_type iio_root_group_type = {
.ct_owner = THIS_MODULE,
diff --git a/drivers/iio/industrialio-sw-trigger.c b/drivers/iio/industrialio-sw-trigger.c
index 4825cfd9c4ea..311f9fe5aa34 100644
--- a/drivers/iio/industrialio-sw-trigger.c
+++ b/drivers/iio/industrialio-sw-trigger.c
@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/iio/sw_trigger.h>
+#include <linux/iio/configfs.h>
#include <linux/configfs.h>
static struct config_group *iio_triggers_group;
diff --git a/include/linux/iio/configfs.h b/include/linux/iio/configfs.h
new file mode 100644
index 000000000000..93befd67c15c
--- /dev/null
+++ b/include/linux/iio/configfs.h
@@ -0,0 +1,15 @@
+/*
+ * Industrial I/O configfs support
+ *
+ * Copyright (c) 2015 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+#ifndef __IIO_CONFIGFS
+#define __IIO_CONFIGFS
+
+extern struct configfs_subsystem iio_configfs_subsys;
+
+#endif /* __IIO_CONFIGFS */
diff --git a/include/linux/iio/sw_trigger.h b/include/linux/iio/sw_trigger.h
index c2f33b2b35a5..5198f8ed08a4 100644
--- a/include/linux/iio/sw_trigger.h
+++ b/include/linux/iio/sw_trigger.h
@@ -20,7 +20,6 @@
module_driver(__iio_sw_trigger_type, iio_register_sw_trigger_type, \
iio_unregister_sw_trigger_type)
-extern struct configfs_subsystem iio_configfs_subsys;
struct iio_sw_trigger_ops;
struct iio_sw_trigger_type {