diff options
author | David Härdeman <david@hardeman.nu> | 2014-04-03 19:32:21 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-25 18:10:43 -0400 |
commit | c5540fbb9de39ceec108a889133664a887c2f55a (patch) | |
tree | 92d1523fa4ab99fc27d14dcd3ee00627eeb8a346 /drivers/media/rc/ir-sony-decoder.c | |
parent | da6e162d6a4607362f8478c715c797d84d449f8b (diff) |
[media] rc-core: remove protocol arrays
The basic API of rc-core used to be:
dev = rc_allocate_device();
dev->x = a;
dev->y = b;
dev->z = c;
rc_register_device();
which is a pretty common pattern in the kernel, after the introduction of
protocol arrays the API looks something like:
dev = rc_allocate_device();
dev->x = a;
rc_set_allowed_protocols(dev, RC_BIT_X);
dev->z = c;
rc_register_device();
There's no real need for the protocols to be an array, so change it
back to be consistent (and in preparation for the following patches).
[m.chehab@samsung.com: added missing changes at some files]
Signed-off-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/rc/ir-sony-decoder.c')
-rw-r--r-- | drivers/media/rc/ir-sony-decoder.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/rc/ir-sony-decoder.c b/drivers/media/rc/ir-sony-decoder.c index f485f9fe1e90..d12dc3da5931 100644 --- a/drivers/media/rc/ir-sony-decoder.c +++ b/drivers/media/rc/ir-sony-decoder.c | |||
@@ -46,8 +46,8 @@ static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev) | |||
46 | u32 scancode; | 46 | u32 scancode; |
47 | u8 device, subdevice, function; | 47 | u8 device, subdevice, function; |
48 | 48 | ||
49 | if (!rc_protocols_enabled(dev, RC_BIT_SONY12 | RC_BIT_SONY15 | | 49 | if (!(dev->enabled_protocols & |
50 | RC_BIT_SONY20)) | 50 | (RC_BIT_SONY12 | RC_BIT_SONY15 | RC_BIT_SONY20))) |
51 | return 0; | 51 | return 0; |
52 | 52 | ||
53 | if (!is_timing_event(ev)) { | 53 | if (!is_timing_event(ev)) { |
@@ -125,7 +125,7 @@ static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev) | |||
125 | 125 | ||
126 | switch (data->count) { | 126 | switch (data->count) { |
127 | case 12: | 127 | case 12: |
128 | if (!rc_protocols_enabled(dev, RC_BIT_SONY12)) { | 128 | if (!(dev->enabled_protocols & RC_BIT_SONY12)) { |
129 | data->state = STATE_INACTIVE; | 129 | data->state = STATE_INACTIVE; |
130 | return 0; | 130 | return 0; |
131 | } | 131 | } |
@@ -135,7 +135,7 @@ static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev) | |||
135 | protocol = RC_TYPE_SONY12; | 135 | protocol = RC_TYPE_SONY12; |
136 | break; | 136 | break; |
137 | case 15: | 137 | case 15: |
138 | if (!rc_protocols_enabled(dev, RC_BIT_SONY15)) { | 138 | if (!(dev->enabled_protocols & RC_BIT_SONY15)) { |
139 | data->state = STATE_INACTIVE; | 139 | data->state = STATE_INACTIVE; |
140 | return 0; | 140 | return 0; |
141 | } | 141 | } |
@@ -145,7 +145,7 @@ static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev) | |||
145 | protocol = RC_TYPE_SONY15; | 145 | protocol = RC_TYPE_SONY15; |
146 | break; | 146 | break; |
147 | case 20: | 147 | case 20: |
148 | if (!rc_protocols_enabled(dev, RC_BIT_SONY20)) { | 148 | if (!(dev->enabled_protocols & RC_BIT_SONY20)) { |
149 | data->state = STATE_INACTIVE; | 149 | data->state = STATE_INACTIVE; |
150 | return 0; | 150 | return 0; |
151 | } | 151 | } |