diff options
| author | Sean Young <sean@mess.org> | 2018-08-21 15:57:52 -0400 |
|---|---|---|
| committer | Tao Huang <huangtao@rock-chips.com> | 2018-12-10 20:36:38 +0800 |
| commit | 143c24afef2ffc37237c0f2211f209d52a450ba4 (patch) | |
| tree | 7d4de1b86a49a305055375067ca51405ae2c7ea7 /include | |
| parent | fc9e98f3fc87077e8ca2e863e9d9faf7e9acd9ed (diff) | |
UPSTREAM: media: rc: Remove init_ir_raw_event and DEFINE_IR_RAW_EVENT macros
This can be done with c99 initializers, which makes the code cleaner
and more transparent. It does require gcc 4.6, because of this bug
in earlier versions:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=10676
Since commit cafa0010cd51 ("Raise the minimum required gcc version to
4.6"), this is the case.
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
(cherry picked from commit 183e19f5b9ee18fc7bc4b3983a91b5d0dd6c7871)
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Conflicts:
drivers/media/pci/cx88/cx88-input.c
drivers/media/rc/imon_raw.c
drivers/media/rc/mceusb.c
drivers/media/rc/meson-ir.c
drivers/media/rc/mtk-cir.c
drivers/media/rc/redrat3.c
drivers/media/rc/sir_ir.c
drivers/media/rc/st_rc.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/rc-core.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/include/media/rc-core.h b/include/media/rc-core.h index 6ba4cc68a326..221ce3452cd0 100644 --- a/include/media/rc-core.h +++ b/include/media/rc-core.h @@ -331,13 +331,6 @@ struct ir_raw_event { unsigned carrier_report:1; }; -#define DEFINE_IR_RAW_EVENT(event) struct ir_raw_event event = {} - -static inline void init_ir_raw_event(struct ir_raw_event *ev) -{ - memset(ev, 0, sizeof(*ev)); -} - #define IR_DEFAULT_TIMEOUT MS_TO_NS(125) #define IR_MAX_DURATION 500000000 /* 500 ms */ #define US_TO_NS(usec) ((usec) * 1000) @@ -358,9 +351,7 @@ int ir_raw_encode_carrier(enum rc_proto protocol); static inline void ir_raw_event_reset(struct rc_dev *dev) { - struct ir_raw_event ev = { .reset = true }; - - ir_raw_event_store(dev, &ev); + ir_raw_event_store(dev, &((struct ir_raw_event) { .reset = true })); dev->idle = true; ir_raw_event_handle(dev); } |