diff options
author | Frank Schaefer <fschaefer.oss@googlemail.com> | 2013-01-13 08:20:42 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-05 17:39:20 -0500 |
commit | 146b7ee63866cee57620ec08d10250f7fffaf4bc (patch) | |
tree | 749d23a56a6b8adc24c8d26ebc83982f24e4eb47 /drivers/media | |
parent | 768da3dbcf50b697e5e7a921492b7f0d2cd8a8fb (diff) |
[media] em28xx: remove unused parameter ir_raw from i2c RC key polling functions
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-input.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-input.c b/drivers/media/usb/em28xx/em28xx-input.c index 72cb0cfad8d0..d500e9c2f9e2 100644 --- a/drivers/media/usb/em28xx/em28xx-input.c +++ b/drivers/media/usb/em28xx/em28xx-input.c | |||
@@ -72,7 +72,7 @@ struct em28xx_IR { | |||
72 | /* external device (if used) */ | 72 | /* external device (if used) */ |
73 | struct i2c_client *i2c_dev; | 73 | struct i2c_client *i2c_dev; |
74 | 74 | ||
75 | int (*get_key_i2c)(struct i2c_client *, u32 *, u32 *); | 75 | int (*get_key_i2c)(struct i2c_client *, u32 *); |
76 | int (*get_key)(struct em28xx_IR *, struct em28xx_ir_poll_result *); | 76 | int (*get_key)(struct em28xx_IR *, struct em28xx_ir_poll_result *); |
77 | }; | 77 | }; |
78 | 78 | ||
@@ -80,8 +80,7 @@ struct em28xx_IR { | |||
80 | I2C IR based get keycodes - should be used with ir-kbd-i2c | 80 | I2C IR based get keycodes - should be used with ir-kbd-i2c |
81 | **********************************************************/ | 81 | **********************************************************/ |
82 | 82 | ||
83 | static int em28xx_get_key_terratec(struct i2c_client *i2c_dev, | 83 | static int em28xx_get_key_terratec(struct i2c_client *i2c_dev, u32 *ir_key) |
84 | u32 *ir_key, u32 *ir_raw) | ||
85 | { | 84 | { |
86 | unsigned char b; | 85 | unsigned char b; |
87 | 86 | ||
@@ -101,12 +100,10 @@ static int em28xx_get_key_terratec(struct i2c_client *i2c_dev, | |||
101 | return 1; | 100 | return 1; |
102 | 101 | ||
103 | *ir_key = b; | 102 | *ir_key = b; |
104 | *ir_raw = b; | ||
105 | return 1; | 103 | return 1; |
106 | } | 104 | } |
107 | 105 | ||
108 | static int em28xx_get_key_em_haup(struct i2c_client *i2c_dev, | 106 | static int em28xx_get_key_em_haup(struct i2c_client *i2c_dev, u32 *ir_key) |
109 | u32 *ir_key, u32 *ir_raw) | ||
110 | { | 107 | { |
111 | unsigned char buf[2]; | 108 | unsigned char buf[2]; |
112 | u16 code; | 109 | u16 code; |
@@ -146,12 +143,11 @@ static int em28xx_get_key_em_haup(struct i2c_client *i2c_dev, | |||
146 | 143 | ||
147 | /* return key */ | 144 | /* return key */ |
148 | *ir_key = code; | 145 | *ir_key = code; |
149 | *ir_raw = code; | ||
150 | return 1; | 146 | return 1; |
151 | } | 147 | } |
152 | 148 | ||
153 | static int em28xx_get_key_pinnacle_usb_grey(struct i2c_client *i2c_dev, | 149 | static int em28xx_get_key_pinnacle_usb_grey(struct i2c_client *i2c_dev, |
154 | u32 *ir_key, u32 *ir_raw) | 150 | u32 *ir_key) |
155 | { | 151 | { |
156 | unsigned char buf[3]; | 152 | unsigned char buf[3]; |
157 | 153 | ||
@@ -164,13 +160,12 @@ static int em28xx_get_key_pinnacle_usb_grey(struct i2c_client *i2c_dev, | |||
164 | return 0; | 160 | return 0; |
165 | 161 | ||
166 | *ir_key = buf[2]&0x3f; | 162 | *ir_key = buf[2]&0x3f; |
167 | *ir_raw = buf[2]&0x3f; | ||
168 | 163 | ||
169 | return 1; | 164 | return 1; |
170 | } | 165 | } |
171 | 166 | ||
172 | static int em28xx_get_key_winfast_usbii_deluxe(struct i2c_client *i2c_dev, | 167 | static int em28xx_get_key_winfast_usbii_deluxe(struct i2c_client *i2c_dev, |
173 | u32 *ir_key, u32 *ir_raw) | 168 | u32 *ir_key) |
174 | { | 169 | { |
175 | unsigned char subaddr, keydetect, key; | 170 | unsigned char subaddr, keydetect, key; |
176 | 171 | ||
@@ -192,7 +187,6 @@ static int em28xx_get_key_winfast_usbii_deluxe(struct i2c_client *i2c_dev, | |||
192 | return 0; | 187 | return 0; |
193 | 188 | ||
194 | *ir_key = key; | 189 | *ir_key = key; |
195 | *ir_raw = key; | ||
196 | return 1; | 190 | return 1; |
197 | } | 191 | } |
198 | 192 | ||
@@ -288,10 +282,10 @@ static int em2874_polling_getkey(struct em28xx_IR *ir, | |||
288 | 282 | ||
289 | static int em28xx_i2c_ir_handle_key(struct em28xx_IR *ir) | 283 | static int em28xx_i2c_ir_handle_key(struct em28xx_IR *ir) |
290 | { | 284 | { |
291 | static u32 ir_key, ir_raw; | 285 | static u32 ir_key; |
292 | int rc; | 286 | int rc; |
293 | 287 | ||
294 | rc = ir->get_key_i2c(ir->i2c_dev, &ir_key, &ir_raw); | 288 | rc = ir->get_key_i2c(ir->i2c_dev, &ir_key); |
295 | if (rc < 0) { | 289 | if (rc < 0) { |
296 | dprintk("ir->get_key_i2c() failed: %d\n", rc); | 290 | dprintk("ir->get_key_i2c() failed: %d\n", rc); |
297 | return rc; | 291 | return rc; |