diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-08 13:07:05 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-12 12:47:44 -0400 |
commit | 7e8e16ca39801279697c6cb6195710ba7653bfc2 (patch) | |
tree | 961ce832551cf3827ca55e345536fb7fe2abfb60 | |
parent | ac07bb73fe226ae2088f060c63829afddb3f2403 (diff) |
V4L/DVB (12713): em28xx: Cleanups at ir_i2c handler
There are some extra parenthesis at the clauses, and some switch() tests
for boards that don't have i2c ir. Remove those extra code.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index a3d6d4ab9bc7..ec4763f73b26 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c | |||
@@ -2213,34 +2213,22 @@ void em28xx_register_i2c_ir(struct em28xx *dev) | |||
2213 | 2213 | ||
2214 | /* detect & configure */ | 2214 | /* detect & configure */ |
2215 | switch (dev->model) { | 2215 | switch (dev->model) { |
2216 | case (EM2800_BOARD_UNKNOWN): | 2216 | case EM2800_BOARD_TERRATEC_CINERGY_200: |
2217 | break; | 2217 | case EM2820_BOARD_TERRATEC_CINERGY_250: |
2218 | case (EM2820_BOARD_UNKNOWN): | ||
2219 | break; | ||
2220 | case (EM2800_BOARD_TERRATEC_CINERGY_200): | ||
2221 | case (EM2820_BOARD_TERRATEC_CINERGY_250): | ||
2222 | dev->init_data.ir_codes = &ir_codes_em_terratec_table; | 2218 | dev->init_data.ir_codes = &ir_codes_em_terratec_table; |
2223 | dev->init_data.get_key = em28xx_get_key_terratec; | 2219 | dev->init_data.get_key = em28xx_get_key_terratec; |
2224 | dev->init_data.name = "i2c IR (EM28XX Terratec)"; | 2220 | dev->init_data.name = "i2c IR (EM28XX Terratec)"; |
2225 | break; | 2221 | break; |
2226 | case (EM2820_BOARD_PINNACLE_USB_2): | 2222 | case EM2820_BOARD_PINNACLE_USB_2: |
2227 | dev->init_data.ir_codes = &ir_codes_pinnacle_grey_table; | 2223 | dev->init_data.ir_codes = &ir_codes_pinnacle_grey_table; |
2228 | dev->init_data.get_key = em28xx_get_key_pinnacle_usb_grey; | 2224 | dev->init_data.get_key = em28xx_get_key_pinnacle_usb_grey; |
2229 | dev->init_data.name = "i2c IR (EM28XX Pinnacle PCTV)"; | 2225 | dev->init_data.name = "i2c IR (EM28XX Pinnacle PCTV)"; |
2230 | break; | 2226 | break; |
2231 | case (EM2820_BOARD_HAUPPAUGE_WINTV_USB_2): | 2227 | case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2: |
2232 | dev->init_data.ir_codes = &ir_codes_hauppauge_new_table; | 2228 | dev->init_data.ir_codes = &ir_codes_hauppauge_new_table; |
2233 | dev->init_data.get_key = em28xx_get_key_em_haup; | 2229 | dev->init_data.get_key = em28xx_get_key_em_haup; |
2234 | dev->init_data.name = "i2c IR (EM2840 Hauppauge)"; | 2230 | dev->init_data.name = "i2c IR (EM2840 Hauppauge)"; |
2235 | break; | 2231 | break; |
2236 | case (EM2820_BOARD_MSI_VOX_USB_2): | ||
2237 | break; | ||
2238 | case (EM2800_BOARD_LEADTEK_WINFAST_USBII): | ||
2239 | break; | ||
2240 | case (EM2800_BOARD_KWORLD_USB2800): | ||
2241 | break; | ||
2242 | case (EM2800_BOARD_GRABBEEX_USB2800): | ||
2243 | break; | ||
2244 | } | 2232 | } |
2245 | 2233 | ||
2246 | if (dev->init_data.name) | 2234 | if (dev->init_data.name) |