diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-07 20:01:31 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-20 23:17:47 -0400 |
commit | 82c3ccaa974345b42cabcdb19f81f4776156b1f7 (patch) | |
tree | 244b799f1b54aba34f30e1f9da25840b268bad0c /drivers/media/video/cx231xx | |
parent | bae94dc39e9530842379208c4406512d34dc7ef3 (diff) |
[media] cx231xx: declare static functions as such
drivers/media/video/cx23885/built-in.o: In function `mc417_memory_write':
/home/v4l/v4l/patchwork/drivers/media/video/cx23885/cx23885-417.c:482: multiple definition of `mc417_memory_write'
drivers/media/video/cx231xx/built-in.o:/home/v4l/v4l/patchwork/drivers/media/video/cx231xx/cx231xx-417.c:477: first defined here
drivers/media/video/cx23885/built-in.o: In function `mc417_gpio_set':
/home/v4l/v4l/patchwork/drivers/media/video/cx23885/cx23885-417.c:636: multiple definition of `mc417_gpio_set'
drivers/media/video/cx231xx/built-in.o:/home/v4l/v4l/patchwork/drivers/media/video/cx231xx/cx231xx-417.c:615: first defined here
drivers/media/video/cx23885/built-in.o: In function `mc417_gpio_enable':
/home/v4l/v4l/patchwork/drivers/media/video/cx23885/cx23885-417.c:656: multiple definition of `mc417_gpio_enable'
drivers/media/video/cx231xx/built-in.o:/home/v4l/v4l/patchwork/drivers/media/video/cx231xx/cx231xx-417.c:635: first defined here
drivers/media/video/cx23885/built-in.o: In function `mc417_memory_read':
/home/v4l/v4l/patchwork/drivers/media/video/cx23885/cx23885-417.c:546: multiple definition of `mc417_memory_read'
drivers/media/video/cx231xx/built-in.o:/home/v4l/v4l/patchwork/drivers/media/video/cx231xx/cx231xx-417.c:541: first defined here
drivers/media/video/cx23885/built-in.o: In function `mc417_gpio_clear':
/home/v4l/v4l/patchwork/drivers/media/video/cx23885/cx23885-417.c:646: multiple definition of `mc417_gpio_clear'
drivers/media/video/cx231xx/built-in.o:/home/v4l/v4l/patchwork/drivers/media/video/cx231xx/cx231xx-417.c:625: first defined here
drivers/media/video/cx23885/built-in.o: In function `mc417_register_read':
/home/v4l/v4l/patchwork/drivers/media/video/cx23885/cx23885-417.c:388: multiple definition of `mc417_register_read'
drivers/media/video/cx231xx/built-in.o:/home/v4l/v4l/patchwork/drivers/media/video/cx231xx/cx231xx-417.c:401: first defined here
drivers/media/video/cx23885/built-in.o: In function `mc417_register_write':
/home/v4l/v4l/patchwork/drivers/media/video/cx23885/cx23885-417.c:324: multiple definition of `mc417_register_write'
drivers/media/video/cx231xx/built-in.o:/home/v4l/v4l/patchwork/drivers/media/video/cx231xx/cx231xx-417.c:343: first defined here
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx231xx')
-rw-r--r-- | drivers/media/video/cx231xx/cx231xx-417.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-417.c b/drivers/media/video/cx231xx/cx231xx-417.c index b5b69989ff8d..2dbad82aab61 100644 --- a/drivers/media/video/cx231xx/cx231xx-417.c +++ b/drivers/media/video/cx231xx/cx231xx-417.c | |||
@@ -296,7 +296,7 @@ enum cx231xx_mute_video_shift { | |||
296 | 296 | ||
297 | 297 | ||
298 | #define CX23417_GPIO_MASK 0xFC0003FF | 298 | #define CX23417_GPIO_MASK 0xFC0003FF |
299 | int setITVCReg(struct cx231xx *dev, u32 gpio_direction, u32 value) | 299 | static int setITVCReg(struct cx231xx *dev, u32 gpio_direction, u32 value) |
300 | { | 300 | { |
301 | int status = 0; | 301 | int status = 0; |
302 | u32 _gpio_direction = 0; | 302 | u32 _gpio_direction = 0; |
@@ -307,7 +307,7 @@ int setITVCReg(struct cx231xx *dev, u32 gpio_direction, u32 value) | |||
307 | (u8 *)&value, 4, 0, 0); | 307 | (u8 *)&value, 4, 0, 0); |
308 | return status; | 308 | return status; |
309 | } | 309 | } |
310 | int getITVCReg(struct cx231xx *dev, u32 gpio_direction, u32 *pValue) | 310 | static int getITVCReg(struct cx231xx *dev, u32 gpio_direction, u32 *pValue) |
311 | { | 311 | { |
312 | int status = 0; | 312 | int status = 0; |
313 | u32 _gpio_direction = 0; | 313 | u32 _gpio_direction = 0; |
@@ -319,7 +319,8 @@ int getITVCReg(struct cx231xx *dev, u32 gpio_direction, u32 *pValue) | |||
319 | (u8 *)pValue, 4, 0, 1); | 319 | (u8 *)pValue, 4, 0, 1); |
320 | return status; | 320 | return status; |
321 | } | 321 | } |
322 | int waitForMciComplete(struct cx231xx *dev) | 322 | |
323 | static int waitForMciComplete(struct cx231xx *dev) | ||
323 | { | 324 | { |
324 | u32 gpio; | 325 | u32 gpio; |
325 | u32 gpio_driection = 0; | 326 | u32 gpio_driection = 0; |
@@ -339,7 +340,7 @@ int waitForMciComplete(struct cx231xx *dev) | |||
339 | return 0; | 340 | return 0; |
340 | } | 341 | } |
341 | 342 | ||
342 | int mc417_register_write(struct cx231xx *dev, u16 address, u32 value) | 343 | static int mc417_register_write(struct cx231xx *dev, u16 address, u32 value) |
343 | { | 344 | { |
344 | u32 temp; | 345 | u32 temp; |
345 | int status = 0; | 346 | int status = 0; |
@@ -397,7 +398,7 @@ int mc417_register_write(struct cx231xx *dev, u16 address, u32 value) | |||
397 | return waitForMciComplete(dev); | 398 | return waitForMciComplete(dev); |
398 | } | 399 | } |
399 | 400 | ||
400 | int mc417_register_read(struct cx231xx *dev, u16 address, u32 *value) | 401 | static int mc417_register_read(struct cx231xx *dev, u16 address, u32 *value) |
401 | { | 402 | { |
402 | /*write address byte 0;*/ | 403 | /*write address byte 0;*/ |
403 | u32 temp; | 404 | u32 temp; |
@@ -473,7 +474,7 @@ int mc417_register_read(struct cx231xx *dev, u16 address, u32 *value) | |||
473 | return ret; | 474 | return ret; |
474 | } | 475 | } |
475 | 476 | ||
476 | int mc417_memory_write(struct cx231xx *dev, u32 address, u32 value) | 477 | static int mc417_memory_write(struct cx231xx *dev, u32 address, u32 value) |
477 | { | 478 | { |
478 | /*write data byte 0;*/ | 479 | /*write data byte 0;*/ |
479 | 480 | ||
@@ -537,7 +538,7 @@ int mc417_memory_write(struct cx231xx *dev, u32 address, u32 value) | |||
537 | return 0; | 538 | return 0; |
538 | } | 539 | } |
539 | 540 | ||
540 | int mc417_memory_read(struct cx231xx *dev, u32 address, u32 *value) | 541 | static int mc417_memory_read(struct cx231xx *dev, u32 address, u32 *value) |
541 | { | 542 | { |
542 | u32 temp = 0; | 543 | u32 temp = 0; |
543 | u32 return_value = 0; | 544 | u32 return_value = 0; |
@@ -611,7 +612,7 @@ int mc417_memory_read(struct cx231xx *dev, u32 address, u32 *value) | |||
611 | return ret; | 612 | return ret; |
612 | } | 613 | } |
613 | 614 | ||
614 | void mc417_gpio_set(struct cx231xx *dev, u32 mask) | 615 | static void mc417_gpio_set(struct cx231xx *dev, u32 mask) |
615 | { | 616 | { |
616 | u32 val; | 617 | u32 val; |
617 | 618 | ||
@@ -621,7 +622,7 @@ void mc417_gpio_set(struct cx231xx *dev, u32 mask) | |||
621 | mc417_register_write(dev, 0x900C, val); | 622 | mc417_register_write(dev, 0x900C, val); |
622 | } | 623 | } |
623 | 624 | ||
624 | void mc417_gpio_clear(struct cx231xx *dev, u32 mask) | 625 | static void mc417_gpio_clear(struct cx231xx *dev, u32 mask) |
625 | { | 626 | { |
626 | u32 val; | 627 | u32 val; |
627 | 628 | ||
@@ -631,7 +632,7 @@ void mc417_gpio_clear(struct cx231xx *dev, u32 mask) | |||
631 | mc417_register_write(dev, 0x900C, val); | 632 | mc417_register_write(dev, 0x900C, val); |
632 | } | 633 | } |
633 | 634 | ||
634 | void mc417_gpio_enable(struct cx231xx *dev, u32 mask, int asoutput) | 635 | static void mc417_gpio_enable(struct cx231xx *dev, u32 mask, int asoutput) |
635 | { | 636 | { |
636 | u32 val; | 637 | u32 val; |
637 | 638 | ||
@@ -873,7 +874,8 @@ static int cx231xx_find_mailbox(struct cx231xx *dev) | |||
873 | dprintk(3, "Mailbox signature values not found!\n"); | 874 | dprintk(3, "Mailbox signature values not found!\n"); |
874 | return -1; | 875 | return -1; |
875 | } | 876 | } |
876 | void mciWriteMemoryToGPIO(struct cx231xx *dev, u32 address, u32 value, | 877 | |
878 | static void mciWriteMemoryToGPIO(struct cx231xx *dev, u32 address, u32 value, | ||
877 | u32 *p_fw_image) | 879 | u32 *p_fw_image) |
878 | { | 880 | { |
879 | 881 | ||
@@ -1095,7 +1097,7 @@ static int cx231xx_load_firmware(struct cx231xx *dev) | |||
1095 | return 0; | 1097 | return 0; |
1096 | } | 1098 | } |
1097 | 1099 | ||
1098 | void cx231xx_417_check_encoder(struct cx231xx *dev) | 1100 | static void cx231xx_417_check_encoder(struct cx231xx *dev) |
1099 | { | 1101 | { |
1100 | u32 status, seq; | 1102 | u32 status, seq; |
1101 | 1103 | ||
@@ -1272,7 +1274,7 @@ static void free_buffer(struct videobuf_queue *vq, struct cx231xx_buffer *buf) | |||
1272 | buf->vb.state = VIDEOBUF_NEEDS_INIT; | 1274 | buf->vb.state = VIDEOBUF_NEEDS_INIT; |
1273 | } | 1275 | } |
1274 | 1276 | ||
1275 | void buffer_copy(struct cx231xx *dev, char *data, int len, struct urb *urb, | 1277 | static void buffer_copy(struct cx231xx *dev, char *data, int len, struct urb *urb, |
1276 | struct cx231xx_dmaqueue *dma_q) | 1278 | struct cx231xx_dmaqueue *dma_q) |
1277 | { | 1279 | { |
1278 | void *vbuf; | 1280 | void *vbuf; |
@@ -1334,7 +1336,7 @@ void buffer_copy(struct cx231xx *dev, char *data, int len, struct urb *urb, | |||
1334 | return; | 1336 | return; |
1335 | } | 1337 | } |
1336 | 1338 | ||
1337 | void buffer_filled(char *data, int len, struct urb *urb, | 1339 | static void buffer_filled(char *data, int len, struct urb *urb, |
1338 | struct cx231xx_dmaqueue *dma_q) | 1340 | struct cx231xx_dmaqueue *dma_q) |
1339 | { | 1341 | { |
1340 | void *vbuf; | 1342 | void *vbuf; |