summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid Härdeman <david@hardeman.nu>2014-04-04 19:06:01 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-04-06 11:30:25 -0300
commit23c843b5eb11198e7de3a2af0756d1f897117932 (patch)
tree9a6a57b60b9d048f105d8585c1e84b0e2d4a3bc0 /include
parent42f5e630e06326fa47b3ba86e572b51c36b0a3b1 (diff)
downloadlinux-stable-23c843b5eb11198e7de3a2af0756d1f897117932.tar.gz
linux-stable-23c843b5eb11198e7de3a2af0756d1f897117932.tar.bz2
linux-stable-23c843b5eb11198e7de3a2af0756d1f897117932.zip
[media] rc-core: split dev->s_filter
Overloading dev->s_filter to do two different functions (set wakeup filters and generic hardware filters) makes it impossible to tell what the hardware actually supports, so create a separate dev->s_wakeup_filter and make the distinction explicit. Signed-off-by: David Härdeman <david@hardeman.nu> Acked-by: James Hogan <james.hogan@imgtec.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'include')
-rw-r--r--include/media/rc-core.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/media/rc-core.h b/include/media/rc-core.h
index 0b9f890ce431..6dbc7c11224f 100644
--- a/include/media/rc-core.h
+++ b/include/media/rc-core.h
@@ -112,7 +112,8 @@ enum rc_filter_type {
* device doesn't interrupt host until it sees IR pulses
* @s_learning_mode: enable wide band receiver used for learning
* @s_carrier_report: enable carrier reports
- * @s_filter: set the scancode filter of a given type
+ * @s_filter: set the scancode filter
+ * @s_wakeup_filter: set the wakeup scancode filter
*/
struct rc_dev {
struct device dev;
@@ -159,8 +160,9 @@ struct rc_dev {
int (*s_learning_mode)(struct rc_dev *dev, int enable);
int (*s_carrier_report) (struct rc_dev *dev, int enable);
int (*s_filter)(struct rc_dev *dev,
- enum rc_filter_type type,
struct rc_scancode_filter *filter);
+ int (*s_wakeup_filter)(struct rc_dev *dev,
+ struct rc_scancode_filter *filter);
};
#define to_rc_dev(d) container_of(d, struct rc_dev, dev)