diff options
| author | Nelson Castillo <arhuaco@freaks-unidos.net> | 2009-03-10 12:04:40 +0000 |
|---|---|---|
| committer | Andy Green <agreen@octopus.localdomain> | 2009-03-10 12:04:40 +0000 |
| commit | 675a93c65029c2cda2d00bb73f9d7f0e1c9d42dc (patch) | |
| tree | eeed4bd25e60816b9abcf6ac5f8890c9e9363f2d /arch | |
| parent | 25db5513242fb8d9fac0f461e110cc82d6b3f90f (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')
| -rw-r--r-- | arch/arm/mach-s3c2410/include/mach/ts.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-gta01.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2442/mach-gta02.c | 3 |
3 files changed, 5 insertions, 3 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, >a01_ts_group.config}, diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c index fa55aba1cba..229271b491d 100644 --- a/arch/arm/mach-s3c2442/mach-gta02.c +++ b/arch/arm/mach-s3c2442/mach-gta02.c @@ -103,6 +103,7 @@ #include "../plat-s3c24xx/neo1973_pm_gps.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> @@ -977,7 +978,7 @@ const static struct ts_filter_linear_configuration gta02_ts_linear = { }; #endif -const struct ts_filter_configuration filter_configuration[] = +const struct ts_filter_chain_configuration filter_configuration[] = { #ifdef CONFIG_TOUCHSCREEN_FILTER {&ts_filter_group_api, >a02_ts_group.config}, |