diff options
author | Adrian Bunk <bunk@stusta.de> | 2006-05-22 09:31:42 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-25 00:59:53 -0400 |
commit | adcb0fa2504aac35e0ed285147b11e75a6db34c7 (patch) | |
tree | 1f1bee13f3e3fea4ad91f30a622776143aa299c1 | |
parent | a9686e0d204e3faa544434c709ccb599f8165252 (diff) |
V4L/DVB (3963): Em28xx/: possible cleanups
This patch contains the following possible cleanups:
- make the following needlessly global functions static:
- em28xx-core.c: em28xx_accumulator_set()
- em28xx-core.c: em28xx_capture_area_set()
- em28xx-core.c: em28xx_scaler_set()
- em28xx-core.c: em28xx_isocIrq()
- remove the following unused EXPORT_SYMBOL's:
- em28xx-cards.c: em28xx_boards
- em28xx-cards.c: em28xx_bcount
- em28xx-cards.c: em28xx_id_table
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 4 | ||||
-rw-r--r-- | drivers/media/video/em28xx/em28xx-core.c | 10 | ||||
-rw-r--r-- | drivers/media/video/em28xx/em28xx.h | 6 |
3 files changed, 5 insertions, 15 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index 9965ee9e9c22..ed882ebc7b95 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c | |||
@@ -326,8 +326,4 @@ void em28xx_card_setup(struct em28xx *dev) | |||
326 | } | 326 | } |
327 | } | 327 | } |
328 | 328 | ||
329 | EXPORT_SYMBOL(em28xx_boards); | ||
330 | EXPORT_SYMBOL(em28xx_bcount); | ||
331 | EXPORT_SYMBOL(em28xx_id_table); | ||
332 | |||
333 | MODULE_DEVICE_TABLE (usb, em28xx_id_table); | 329 | MODULE_DEVICE_TABLE (usb, em28xx_id_table); |
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c index 3d2a56ac2e1b..4350cc75b025 100644 --- a/drivers/media/video/em28xx/em28xx-core.c +++ b/drivers/media/video/em28xx/em28xx-core.c | |||
@@ -317,8 +317,8 @@ int em28xx_outfmt_set_yuv422(struct em28xx *dev) | |||
317 | return em28xx_write_regs(dev, VINCTRL_REG, "\x11", 1); | 317 | return em28xx_write_regs(dev, VINCTRL_REG, "\x11", 1); |
318 | } | 318 | } |
319 | 319 | ||
320 | int em28xx_accumulator_set(struct em28xx *dev, u8 xmin, u8 xmax, u8 ymin, | 320 | static int em28xx_accumulator_set(struct em28xx *dev, u8 xmin, u8 xmax, |
321 | u8 ymax) | 321 | u8 ymin, u8 ymax) |
322 | { | 322 | { |
323 | em28xx_coredbg("em28xx Scale: (%d,%d)-(%d,%d)\n", xmin, ymin, xmax, ymax); | 323 | em28xx_coredbg("em28xx Scale: (%d,%d)-(%d,%d)\n", xmin, ymin, xmax, ymax); |
324 | 324 | ||
@@ -328,7 +328,7 @@ int em28xx_accumulator_set(struct em28xx *dev, u8 xmin, u8 xmax, u8 ymin, | |||
328 | return em28xx_write_regs(dev, YMAX_REG, &ymax, 1); | 328 | return em28xx_write_regs(dev, YMAX_REG, &ymax, 1); |
329 | } | 329 | } |
330 | 330 | ||
331 | int em28xx_capture_area_set(struct em28xx *dev, u8 hstart, u8 vstart, | 331 | static int em28xx_capture_area_set(struct em28xx *dev, u8 hstart, u8 vstart, |
332 | u16 width, u16 height) | 332 | u16 width, u16 height) |
333 | { | 333 | { |
334 | u8 cwidth = width; | 334 | u8 cwidth = width; |
@@ -345,7 +345,7 @@ int em28xx_capture_area_set(struct em28xx *dev, u8 hstart, u8 vstart, | |||
345 | return em28xx_write_regs(dev, OFLOW_REG, &overflow, 1); | 345 | return em28xx_write_regs(dev, OFLOW_REG, &overflow, 1); |
346 | } | 346 | } |
347 | 347 | ||
348 | int em28xx_scaler_set(struct em28xx *dev, u16 h, u16 v) | 348 | static int em28xx_scaler_set(struct em28xx *dev, u16 h, u16 v) |
349 | { | 349 | { |
350 | u8 mode; | 350 | u8 mode; |
351 | /* the em2800 scaler only supports scaling down to 50% */ | 351 | /* the em2800 scaler only supports scaling down to 50% */ |
@@ -534,7 +534,7 @@ static inline void em28xx_isoc_video_copy(struct em28xx *dev, | |||
534 | * em28xx_isoIrq() | 534 | * em28xx_isoIrq() |
535 | * handles the incoming isoc urbs and fills the frames from our inqueue | 535 | * handles the incoming isoc urbs and fills the frames from our inqueue |
536 | */ | 536 | */ |
537 | void em28xx_isocIrq(struct urb *urb, struct pt_regs *regs) | 537 | static void em28xx_isocIrq(struct urb *urb, struct pt_regs *regs) |
538 | { | 538 | { |
539 | struct em28xx *dev = urb->context; | 539 | struct em28xx *dev = urb->context; |
540 | int i, status; | 540 | int i, status; |
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h index ee3962ce88fd..d8fcc9e17ac0 100644 --- a/drivers/media/video/em28xx/em28xx.h +++ b/drivers/media/video/em28xx/em28xx.h | |||
@@ -319,13 +319,7 @@ int em28xx_audio_analog_set(struct em28xx *dev); | |||
319 | int em28xx_colorlevels_set_default(struct em28xx *dev); | 319 | int em28xx_colorlevels_set_default(struct em28xx *dev); |
320 | int em28xx_capture_start(struct em28xx *dev, int start); | 320 | int em28xx_capture_start(struct em28xx *dev, int start); |
321 | int em28xx_outfmt_set_yuv422(struct em28xx *dev); | 321 | int em28xx_outfmt_set_yuv422(struct em28xx *dev); |
322 | int em28xx_accumulator_set(struct em28xx *dev, u8 xmin, u8 xmax, u8 ymin, | ||
323 | u8 ymax); | ||
324 | int em28xx_capture_area_set(struct em28xx *dev, u8 hstart, u8 vstart, | ||
325 | u16 width, u16 height); | ||
326 | int em28xx_scaler_set(struct em28xx *dev, u16 h, u16 v); | ||
327 | int em28xx_resolution_set(struct em28xx *dev); | 322 | int em28xx_resolution_set(struct em28xx *dev); |
328 | void em28xx_isocIrq(struct urb *urb, struct pt_regs *regs); | ||
329 | int em28xx_init_isoc(struct em28xx *dev); | 323 | int em28xx_init_isoc(struct em28xx *dev); |
330 | void em28xx_uninit_isoc(struct em28xx *dev); | 324 | void em28xx_uninit_isoc(struct em28xx *dev); |
331 | int em28xx_set_alternate(struct em28xx *dev); | 325 | int em28xx_set_alternate(struct em28xx *dev); |