aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzequiel Garcia <elezegarcia@gmail.com>2012-04-28 08:57:01 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-05-14 15:06:13 -0400
commit60332f033d4c8655e0afcea932e16d44646e82bf (patch)
tree6564b046cc03f83bc438b134c2ad647eb9822ae3
parent152a3a7320d1582009db85d8be365ce430d079af (diff)
[media] em28xx: Make card_setup() and pre_card_setup() static
This cleans namespace a bit by making em28xx_card_setup() em28xx_pre_card_setup() static functions. Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c6
-rw-r--r--drivers/media/video/em28xx/em28xx.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 0ac117c23c47..5dd6806c75ab 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -69,6 +69,8 @@ struct em28xx_hash_table {
69 unsigned int tuner; 69 unsigned int tuner;
70}; 70};
71 71
72static void em28xx_pre_card_setup(struct em28xx *dev);
73
72/* 74/*
73 * Reset sequences for analog/digital modes 75 * Reset sequences for analog/digital modes
74 */ 76 */
@@ -2361,7 +2363,7 @@ static int em28xx_hint_sensor(struct em28xx *dev)
2361/* Since em28xx_pre_card_setup() requires a proper dev->model, 2363/* Since em28xx_pre_card_setup() requires a proper dev->model,
2362 * this won't work for boards with generic PCI IDs 2364 * this won't work for boards with generic PCI IDs
2363 */ 2365 */
2364void em28xx_pre_card_setup(struct em28xx *dev) 2366static void em28xx_pre_card_setup(struct em28xx *dev)
2365{ 2367{
2366 /* Set the initial XCLK and I2C clock values based on the board 2368 /* Set the initial XCLK and I2C clock values based on the board
2367 definition */ 2369 definition */
@@ -2661,7 +2663,7 @@ static int em28xx_hint_board(struct em28xx *dev)
2661 return -1; 2663 return -1;
2662} 2664}
2663 2665
2664void em28xx_card_setup(struct em28xx *dev) 2666static void em28xx_card_setup(struct em28xx *dev)
2665{ 2667{
2666 /* 2668 /*
2667 * If the device can be a webcam, seek for a sensor. 2669 * If the device can be a webcam, seek for a sensor.
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 9a2bd5c40163..9486eacc6e0f 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -698,8 +698,6 @@ void em28xx_release_analog_resources(struct em28xx *dev);
698 698
699/* Provided by em28xx-cards.c */ 699/* Provided by em28xx-cards.c */
700extern int em2800_variant_detect(struct usb_device *udev, int model); 700extern int em2800_variant_detect(struct usb_device *udev, int model);
701extern void em28xx_pre_card_setup(struct em28xx *dev);
702extern void em28xx_card_setup(struct em28xx *dev);
703extern struct em28xx_board em28xx_boards[]; 701extern struct em28xx_board em28xx_boards[];
704extern struct usb_device_id em28xx_id_table[]; 702extern struct usb_device_id em28xx_id_table[];
705extern const unsigned int em28xx_bcount; 703extern const unsigned int em28xx_bcount;