aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c4
-rw-r--r--drivers/media/video/em28xx/em28xx-core.c10
-rw-r--r--drivers/media/video/em28xx/em28xx.h6
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
329EXPORT_SYMBOL(em28xx_boards);
330EXPORT_SYMBOL(em28xx_bcount);
331EXPORT_SYMBOL(em28xx_id_table);
332
333MODULE_DEVICE_TABLE (usb, em28xx_id_table); 329MODULE_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
320int em28xx_accumulator_set(struct em28xx *dev, u8 xmin, u8 xmax, u8 ymin, 320static 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
331int em28xx_capture_area_set(struct em28xx *dev, u8 hstart, u8 vstart, 331static 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
348int em28xx_scaler_set(struct em28xx *dev, u16 h, u16 v) 348static 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 */
537void em28xx_isocIrq(struct urb *urb, struct pt_regs *regs) 537static 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);
319int em28xx_colorlevels_set_default(struct em28xx *dev); 319int em28xx_colorlevels_set_default(struct em28xx *dev);
320int em28xx_capture_start(struct em28xx *dev, int start); 320int em28xx_capture_start(struct em28xx *dev, int start);
321int em28xx_outfmt_set_yuv422(struct em28xx *dev); 321int em28xx_outfmt_set_yuv422(struct em28xx *dev);
322int em28xx_accumulator_set(struct em28xx *dev, u8 xmin, u8 xmax, u8 ymin,
323 u8 ymax);
324int em28xx_capture_area_set(struct em28xx *dev, u8 hstart, u8 vstart,
325 u16 width, u16 height);
326int em28xx_scaler_set(struct em28xx *dev, u16 h, u16 v);
327int em28xx_resolution_set(struct em28xx *dev); 322int em28xx_resolution_set(struct em28xx *dev);
328void em28xx_isocIrq(struct urb *urb, struct pt_regs *regs);
329int em28xx_init_isoc(struct em28xx *dev); 323int em28xx_init_isoc(struct em28xx *dev);
330void em28xx_uninit_isoc(struct em28xx *dev); 324void em28xx_uninit_isoc(struct em28xx *dev);
331int em28xx_set_alternate(struct em28xx *dev); 325int em28xx_set_alternate(struct em28xx *dev);