diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-03 11:31:36 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-06 20:44:02 -0400 |
commit | cde4362f0244a70bab73e37e24f167186bb9a8be (patch) | |
tree | 17a52f26a6d14c9742c698b2b7e109fad6ac8695 /drivers/media/video/cx231xx/cx231xx.h | |
parent | 84b5dbf39ed2f51224841bbbf08439158d69d427 (diff) |
V4L/DVB (10956): cx231xx: First series of manual CodingStyle fixes
This patch cleans up CodingStyle on the following source files:
There are still much more to be fixed on later patches
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx231xx/cx231xx.h')
-rw-r--r-- | drivers/media/video/cx231xx/cx231xx.h | 60 |
1 files changed, 29 insertions, 31 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx.h b/drivers/media/video/cx231xx/cx231xx.h index 1f6c5be65a55..d98b36d772bd 100644 --- a/drivers/media/video/cx231xx/cx231xx.h +++ b/drivers/media/video/cx231xx/cx231xx.h | |||
@@ -140,8 +140,7 @@ struct cx231xx_usb_isoc_ctl { | |||
140 | int nfields; | 140 | int nfields; |
141 | 141 | ||
142 | /* isoc urb callback */ | 142 | /* isoc urb callback */ |
143 | int (*isoc_copy) (struct cx231xx * dev, struct urb * urb); | 143 | int (*isoc_copy) (struct cx231xx *dev, struct urb *urb); |
144 | |||
145 | }; | 144 | }; |
146 | 145 | ||
147 | struct cx231xx_fmt { | 146 | struct cx231xx_fmt { |
@@ -497,20 +496,19 @@ struct cx231xx { | |||
497 | char urb_buf[URB_MAX_CTRL_SIZE]; /* urb control msg buffer */ | 496 | char urb_buf[URB_MAX_CTRL_SIZE]; /* urb control msg buffer */ |
498 | 497 | ||
499 | /* helper funcs that call usb_control_msg */ | 498 | /* helper funcs that call usb_control_msg */ |
500 | int (*cx231xx_read_ctrl_reg) (struct cx231xx * dev, u8 req, u16 reg, | 499 | int (*cx231xx_read_ctrl_reg) (struct cx231xx *dev, u8 req, u16 reg, |
501 | char *buf, int len); | 500 | char *buf, int len); |
502 | int (*cx231xx_write_ctrl_reg) (struct cx231xx * dev, u8 req, u16 reg, | 501 | int (*cx231xx_write_ctrl_reg) (struct cx231xx *dev, u8 req, u16 reg, |
503 | char *buf, int len); | 502 | char *buf, int len); |
504 | int (*cx231xx_send_usb_command) (struct cx231xx_i2c * i2c_bus, | 503 | int (*cx231xx_send_usb_command) (struct cx231xx_i2c *i2c_bus, |
505 | struct cx231xx_i2c_xfer_data * | 504 | struct cx231xx_i2c_xfer_data *req_data); |
506 | req_data); | 505 | int (*cx231xx_gpio_i2c_read) (struct cx231xx *dev, u8 dev_addr, |
507 | int (*cx231xx_gpio_i2c_read) (struct cx231xx * dev, u8 dev_addr, | 506 | u8 *buf, u8 len); |
508 | u8 * buf, u8 len); | 507 | int (*cx231xx_gpio_i2c_write) (struct cx231xx *dev, u8 dev_addr, |
509 | int (*cx231xx_gpio_i2c_write) (struct cx231xx * dev, u8 dev_addr, | 508 | u8 *buf, u8 len); |
510 | u8 * buf, u8 len); | ||
511 | 509 | ||
512 | int (*cx231xx_set_analog_freq) (struct cx231xx * dev, u32 freq); | 510 | int (*cx231xx_set_analog_freq) (struct cx231xx *dev, u32 freq); |
513 | int (*cx231xx_reset_analog_tuner) (struct cx231xx * dev); | 511 | int (*cx231xx_reset_analog_tuner) (struct cx231xx *dev); |
514 | 512 | ||
515 | enum cx231xx_mode mode; | 513 | enum cx231xx_mode mode; |
516 | 514 | ||
@@ -562,7 +560,7 @@ int cx231xx_i2c_unregister(struct cx231xx_i2c *bus); | |||
562 | 560 | ||
563 | /* Internal block control functions */ | 561 | /* Internal block control functions */ |
564 | int cx231xx_read_i2c_data(struct cx231xx *dev, u8 dev_addr, | 562 | int cx231xx_read_i2c_data(struct cx231xx *dev, u8 dev_addr, |
565 | u16 saddr, u8 saddr_len, u32 * data, u8 data_len); | 563 | u16 saddr, u8 saddr_len, u32 *data, u8 data_len); |
566 | int cx231xx_write_i2c_data(struct cx231xx *dev, u8 dev_addr, | 564 | int cx231xx_write_i2c_data(struct cx231xx *dev, u8 dev_addr, |
567 | u16 saddr, u8 saddr_len, u32 data, u8 data_len); | 565 | u16 saddr, u8 saddr_len, u32 data, u8 data_len); |
568 | int cx231xx_reg_mask_write(struct cx231xx *dev, u8 dev_addr, u8 size, | 566 | int cx231xx_reg_mask_write(struct cx231xx *dev, u8 dev_addr, u8 size, |
@@ -594,20 +592,20 @@ int cx231xx_tuner_pre_channel_change(struct cx231xx *dev); | |||
594 | int cx231xx_tuner_post_channel_change(struct cx231xx *dev); | 592 | int cx231xx_tuner_post_channel_change(struct cx231xx *dev); |
595 | 593 | ||
596 | /* video parser functions */ | 594 | /* video parser functions */ |
597 | u8 cx231xx_find_next_SAV_EAV(u8 * p_buffer, u32 buffer_size, | 595 | u8 cx231xx_find_next_SAV_EAV(u8 *p_buffer, u32 buffer_size, |
598 | u32 * p_bytes_used); | 596 | u32 *p_bytes_used); |
599 | u8 cx231xx_find_boundary_SAV_EAV(u8 * p_buffer, u8 * partial_buf, | 597 | u8 cx231xx_find_boundary_SAV_EAV(u8 *p_buffer, u8 *partial_buf, |
600 | u32 * p_bytes_used); | 598 | u32 *p_bytes_used); |
601 | int cx231xx_do_copy(struct cx231xx *dev, struct cx231xx_dmaqueue *dma_q, | 599 | int cx231xx_do_copy(struct cx231xx *dev, struct cx231xx_dmaqueue *dma_q, |
602 | u8 * p_buffer, u32 bytes_to_copy); | 600 | u8 *p_buffer, u32 bytes_to_copy); |
603 | void cx231xx_reset_video_buffer(struct cx231xx *dev, | 601 | void cx231xx_reset_video_buffer(struct cx231xx *dev, |
604 | struct cx231xx_dmaqueue *dma_q); | 602 | struct cx231xx_dmaqueue *dma_q); |
605 | u8 cx231xx_is_buffer_done(struct cx231xx *dev, struct cx231xx_dmaqueue *dma_q); | 603 | u8 cx231xx_is_buffer_done(struct cx231xx *dev, struct cx231xx_dmaqueue *dma_q); |
606 | u32 cx231xx_copy_video_line(struct cx231xx *dev, struct cx231xx_dmaqueue *dma_q, | 604 | u32 cx231xx_copy_video_line(struct cx231xx *dev, struct cx231xx_dmaqueue *dma_q, |
607 | u8 * p_line, u32 length, int field_number); | 605 | u8 *p_line, u32 length, int field_number); |
608 | u32 cx231xx_get_video_line(struct cx231xx *dev, struct cx231xx_dmaqueue *dma_q, | 606 | u32 cx231xx_get_video_line(struct cx231xx *dev, struct cx231xx_dmaqueue *dma_q, |
609 | u8 sav_eav, u8 * p_buffer, u32 buffer_size); | 607 | u8 sav_eav, u8 *p_buffer, u32 buffer_size); |
610 | void cx231xx_swab(u16 * from, u16 * to, u16 len); | 608 | void cx231xx_swab(u16 *from, u16 *to, u16 len); |
611 | 609 | ||
612 | /* Provided by cx231xx-core.c */ | 610 | /* Provided by cx231xx-core.c */ |
613 | 611 | ||
@@ -624,15 +622,15 @@ int cx231xx_write_ctrl_reg(struct cx231xx *dev, u8 req, u16 reg, | |||
624 | char *buf, int len); | 622 | char *buf, int len); |
625 | int cx231xx_mode_register(struct cx231xx *dev, u16 address, u32 mode); | 623 | int cx231xx_mode_register(struct cx231xx *dev, u16 address, u32 mode); |
626 | 624 | ||
627 | int cx231xx_send_vendor_cmd(struct cx231xx *dev, VENDOR_REQUEST_IN * ven_req); | 625 | int cx231xx_send_vendor_cmd(struct cx231xx *dev, VENDOR_REQUEST_IN *ven_req); |
628 | int cx231xx_send_usb_command(struct cx231xx_i2c *i2c_bus, | 626 | int cx231xx_send_usb_command(struct cx231xx_i2c *i2c_bus, |
629 | struct cx231xx_i2c_xfer_data *req_data); | 627 | struct cx231xx_i2c_xfer_data *req_data); |
630 | 628 | ||
631 | /* Gpio related functions */ | 629 | /* Gpio related functions */ |
632 | int cx231xx_send_gpio_cmd(struct cx231xx *dev, u32 gpio_bit, u8 * gpio_val, | 630 | int cx231xx_send_gpio_cmd(struct cx231xx *dev, u32 gpio_bit, u8 *gpio_val, |
633 | u8 len, u8 request, u8 direction); | 631 | u8 len, u8 request, u8 direction); |
634 | int cx231xx_set_gpio_bit(struct cx231xx *dev, u32 gpio_bit, u8 * gpio_val); | 632 | int cx231xx_set_gpio_bit(struct cx231xx *dev, u32 gpio_bit, u8 *gpio_val); |
635 | int cx231xx_get_gpio_bit(struct cx231xx *dev, u32 gpio_bit, u8 * gpio_val); | 633 | int cx231xx_get_gpio_bit(struct cx231xx *dev, u32 gpio_bit, u8 *gpio_val); |
636 | int cx231xx_set_gpio_value(struct cx231xx *dev, int pin_number, int pin_value); | 634 | int cx231xx_set_gpio_value(struct cx231xx *dev, int pin_number, int pin_value); |
637 | int cx231xx_set_gpio_direction(struct cx231xx *dev, int pin_number, | 635 | int cx231xx_set_gpio_direction(struct cx231xx *dev, int pin_number, |
638 | int pin_value); | 636 | int pin_value); |
@@ -640,13 +638,13 @@ int cx231xx_set_gpio_direction(struct cx231xx *dev, int pin_number, | |||
640 | int cx231xx_gpio_i2c_start(struct cx231xx *dev); | 638 | int cx231xx_gpio_i2c_start(struct cx231xx *dev); |
641 | int cx231xx_gpio_i2c_end(struct cx231xx *dev); | 639 | int cx231xx_gpio_i2c_end(struct cx231xx *dev); |
642 | int cx231xx_gpio_i2c_write_byte(struct cx231xx *dev, u8 data); | 640 | int cx231xx_gpio_i2c_write_byte(struct cx231xx *dev, u8 data); |
643 | int cx231xx_gpio_i2c_read_byte(struct cx231xx *dev, u8 * buf); | 641 | int cx231xx_gpio_i2c_read_byte(struct cx231xx *dev, u8 *buf); |
644 | int cx231xx_gpio_i2c_read_ack(struct cx231xx *dev); | 642 | int cx231xx_gpio_i2c_read_ack(struct cx231xx *dev); |
645 | int cx231xx_gpio_i2c_write_ack(struct cx231xx *dev); | 643 | int cx231xx_gpio_i2c_write_ack(struct cx231xx *dev); |
646 | int cx231xx_gpio_i2c_write_nak(struct cx231xx *dev); | 644 | int cx231xx_gpio_i2c_write_nak(struct cx231xx *dev); |
647 | 645 | ||
648 | int cx231xx_gpio_i2c_read(struct cx231xx *dev, u8 dev_addr, u8 * buf, u8 len); | 646 | int cx231xx_gpio_i2c_read(struct cx231xx *dev, u8 dev_addr, u8 *buf, u8 len); |
649 | int cx231xx_gpio_i2c_write(struct cx231xx *dev, u8 dev_addr, u8 * buf, u8 len); | 647 | int cx231xx_gpio_i2c_write(struct cx231xx *dev, u8 dev_addr, u8 *buf, u8 len); |
650 | 648 | ||
651 | /* audio related functions */ | 649 | /* audio related functions */ |
652 | int cx231xx_set_audio_decoder_input(struct cx231xx *dev, | 650 | int cx231xx_set_audio_decoder_input(struct cx231xx *dev, |
@@ -658,8 +656,8 @@ int cx231xx_set_video_alternate(struct cx231xx *dev); | |||
658 | int cx231xx_set_alt_setting(struct cx231xx *dev, u8 index, u8 alt); | 656 | int cx231xx_set_alt_setting(struct cx231xx *dev, u8 index, u8 alt); |
659 | int cx231xx_init_isoc(struct cx231xx *dev, int max_packets, | 657 | int cx231xx_init_isoc(struct cx231xx *dev, int max_packets, |
660 | int num_bufs, int max_pkt_size, | 658 | int num_bufs, int max_pkt_size, |
661 | int (*isoc_copy) (struct cx231xx * dev, | 659 | int (*isoc_copy) (struct cx231xx *dev, |
662 | struct urb * urb)); | 660 | struct urb *urb)); |
663 | void cx231xx_uninit_isoc(struct cx231xx *dev); | 661 | void cx231xx_uninit_isoc(struct cx231xx *dev); |
664 | int cx231xx_set_mode(struct cx231xx *dev, enum cx231xx_mode set_mode); | 662 | int cx231xx_set_mode(struct cx231xx *dev, enum cx231xx_mode set_mode); |
665 | int cx231xx_gpio_set(struct cx231xx *dev, struct cx231xx_reg_seq *gpio); | 663 | int cx231xx_gpio_set(struct cx231xx *dev, struct cx231xx_reg_seq *gpio); |