diff options
| author | David Härdeman <david@hardeman.nu> | 2014-04-04 19:06:01 -0300 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 11:59:02 +0900 |
| commit | 8b1fbbd321e039bfdfe5cefa33dc465909e9f641 (patch) | |
| tree | ef83c47a88d62abc226bc5944fd7e7aa8c0b3b69 /include/media | |
| parent | 1cef3e44ab616792ed7b9423ed44383d6d059aed (diff) | |
| download | linux-3.10-8b1fbbd321e039bfdfe5cefa33dc465909e9f641.tar.gz linux-3.10-8b1fbbd321e039bfdfe5cefa33dc465909e9f641.tar.bz2 linux-3.10-8b1fbbd321e039bfdfe5cefa33dc465909e9f641.zip | |
upstream: [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/media')
| -rw-r--r-- | include/media/rc-core.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/media/rc-core.h b/include/media/rc-core.h index 0b9f890ce43..a28d70858cd 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) |