aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c2410
diff options
context:
space:
mode:
authorNelson Castillo <arhuaco@freaks-unidos.net>2009-03-10 12:04:40 +0000
committerAndy Green <agreen@octopus.localdomain>2009-03-10 12:04:40 +0000
commit675a93c65029c2cda2d00bb73f9d7f0e1c9d42dc (patch)
treeeeed4bd25e60816b9abcf6ac5f8890c9e9363f2d /arch/arm/mach-s3c2410
parent25db5513242fb8d9fac0f461e110cc82d6b3f90f (diff)
Add filter_chain object
Filter chains should be completely opaque to the drivers that use it. We fix this with this patch. ~ Make the "filter chain" a new object. ~ We can build with CONFIG_TOUCHSCREEN_FILTER=n with no problems in a cleaner way. ~ Update s3c2410_ts.c to use the filter_chain object. ~ Cleanups. Signed-off-by: Nelson Castillo <arhuaco@freaks-unidos.net>
Diffstat (limited to 'arch/arm/mach-s3c2410')
-rw-r--r--arch/arm/mach-s3c2410/include/mach/ts.h2
-rw-r--r--arch/arm/mach-s3c2410/mach-gta01.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/ts.h b/arch/arm/mach-s3c2410/include/mach/ts.h
index 41ac64cdd58..ffd73d5bda2 100644
--- a/arch/arm/mach-s3c2410/include/mach/ts.h
+++ b/arch/arm/mach-s3c2410/include/mach/ts.h
@@ -27,7 +27,7 @@ struct s3c2410_ts_mach_info {
* Null-terminated array of pointers to filter APIs and configurations
* we want to use. In the same order they will be applied.
*/
- const struct ts_filter_configuration *filter_config;
+ const struct ts_filter_chain_configuration *filter_config;
};
void set_s3c2410ts_info(const struct s3c2410_ts_mach_info *hard_s3c2410ts_info);
diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
index d40cd838ede..a828b66ea55 100644
--- a/arch/arm/mach-s3c2410/mach-gta01.c
+++ b/arch/arm/mach-s3c2410/mach-gta01.c
@@ -89,6 +89,7 @@
#include <linux/jbt6k74.h>
+#include <../drivers/input/touchscreen/ts_filter_chain.h>
#ifdef CONFIG_TOUCHSCREEN_FILTER
#include <../drivers/input/touchscreen/ts_filter_linear.h>
#include <../drivers/input/touchscreen/ts_filter_mean.h>
@@ -730,7 +731,7 @@ static struct ts_filter_linear_configuration gta01_ts_linear = {
};
#endif
-struct ts_filter_configuration filter_configuration[] =
+struct ts_filter_chain_configuration filter_configuration[] =
{
#ifdef CONFIG_TOUCHSCREEN_FILTER
{&ts_filter_group_api, &gta01_ts_group.config},