aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/zc3xx.c
diff options
context:
space:
mode:
authorJean-François Moine <moinejf@free.fr>2010-10-19 03:29:10 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-21 12:50:06 -0400
commit780e312175f688ab5ab6124c91d46fa2b9afe2d2 (patch)
tree3830f521b82765b0cfa71e7bb1a4a617091d685f /drivers/media/video/gspca/zc3xx.c
parent76ad3b684ae6bf43662f8fc57501e4ad0e3b12e8 (diff)
[media] gspca: Fix coding style issues
The errors were found by checkpatch.pl. Most fixes are: - remove spaces followed by TAB(s), - split lines greater than 80 characters, - move most '{'s from start of line to end of previous line. (Some '{'s at start of line remain when the '}'s are on the same line) Signed-off-by: Jean-François Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/zc3xx.c')
-rw-r--r--drivers/media/video/gspca/zc3xx.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c
index c9c2b89c5bf9..c7e1970ca284 100644
--- a/drivers/media/video/gspca/zc3xx.c
+++ b/drivers/media/video/gspca/zc3xx.c
@@ -2951,7 +2951,7 @@ static const struct usb_action mc501cb_Initial[] = {
2951 {} 2951 {}
2952}; 2952};
2953 2953
2954static const struct usb_action mc501cb_InitialScale[] = { /* 320x240 */ 2954static const struct usb_action mc501cb_InitialScale[] = { /* 320x240 */
2955 {0xa0, 0x01, ZC3XX_R000_SYSTEMCONTROL}, /* 00,00,01,cc */ 2955 {0xa0, 0x01, ZC3XX_R000_SYSTEMCONTROL}, /* 00,00,01,cc */
2956 {0xa0, 0x10, ZC3XX_R002_CLOCKSELECT}, /* 00,02,10,cc */ 2956 {0xa0, 0x10, ZC3XX_R002_CLOCKSELECT}, /* 00,02,10,cc */
2957 {0xa0, 0x01, ZC3XX_R010_CMOSSENSORSELECT}, /* 00,10,01,cc */ 2957 {0xa0, 0x01, ZC3XX_R010_CMOSSENSORSELECT}, /* 00,10,01,cc */
@@ -3729,7 +3729,6 @@ static const struct usb_action pas106b_InitialScale[] = { /* 176x144 */
3729 {0xaa, 0x0d, 0x0000}, 3729 {0xaa, 0x0d, 0x0000},
3730 {0xaa, 0x0e, 0x0002}, 3730 {0xaa, 0x0e, 0x0002},
3731 {0xaa, 0x14, 0x0081}, 3731 {0xaa, 0x14, 0x0081},
3732
3733/* Other registers */ 3732/* Other registers */
3734 {0xa0, 0x37, ZC3XX_R101_SENSORCORRECTION}, 3733 {0xa0, 0x37, ZC3XX_R101_SENSORCORRECTION},
3735/* Frame retreiving */ 3734/* Frame retreiving */
@@ -3783,7 +3782,6 @@ static const struct usb_action pas106b_InitialScale[] = { /* 176x144 */
3783 {0xa0, 0x05, ZC3XX_R185_WINYWIDTH}, 3782 {0xa0, 0x05, ZC3XX_R185_WINYWIDTH},
3784 {0xa0, 0x14, ZC3XX_R186_WINYCENTER}, 3783 {0xa0, 0x14, ZC3XX_R186_WINYCENTER},
3785 {0xa0, 0x00, ZC3XX_R180_AUTOCORRECTENABLE}, 3784 {0xa0, 0x00, ZC3XX_R180_AUTOCORRECTENABLE},
3786
3787/* Auto exposure and white balance */ 3785/* Auto exposure and white balance */
3788 {0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH}, 3786 {0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH},
3789 {0xa0, 0x03, ZC3XX_R191_EXPOSURELIMITMID}, 3787 {0xa0, 0x03, ZC3XX_R191_EXPOSURELIMITMID},
@@ -3847,7 +3845,6 @@ static const struct usb_action pas106b_Initial[] = { /* 352x288 */
3847 {0xaa, 0x0d, 0x0000}, 3845 {0xaa, 0x0d, 0x0000},
3848 {0xaa, 0x0e, 0x0002}, 3846 {0xaa, 0x0e, 0x0002},
3849 {0xaa, 0x14, 0x0081}, 3847 {0xaa, 0x14, 0x0081},
3850
3851/* Other registers */ 3848/* Other registers */
3852 {0xa0, 0x37, ZC3XX_R101_SENSORCORRECTION}, 3849 {0xa0, 0x37, ZC3XX_R101_SENSORCORRECTION},
3853/* Frame retreiving */ 3850/* Frame retreiving */
@@ -6307,8 +6304,7 @@ static int vga_3wr_probe(struct gspca_dev *gspca_dev)
6307 if (chipset_revision_sensor[i].revision == retword) { 6304 if (chipset_revision_sensor[i].revision == retword) {
6308 sd->chip_revision = retword; 6305 sd->chip_revision = retword;
6309 send_unknown(gspca_dev, SENSOR_PB0330); 6306 send_unknown(gspca_dev, SENSOR_PB0330);
6310 return chipset_revision_sensor[i] 6307 return chipset_revision_sensor[i].internal_sensor_id;
6311 .internal_sensor_id;
6312 } 6308 }
6313 } 6309 }
6314 6310
@@ -6787,7 +6783,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
6787 /* fall thru */ 6783 /* fall thru */
6788 case SENSOR_PAS202B: 6784 case SENSOR_PAS202B:
6789 case SENSOR_PO2030: 6785 case SENSOR_PO2030:
6790/* reg_w(gspca_dev, 0x40, ZC3XX_R117_GGAIN); * (from win traces) */ 6786/* reg_w(gspca_dev, 0x40, ZC3XX_R117_GGAIN); in win traces */
6791 reg_r(gspca_dev, 0x0180); 6787 reg_r(gspca_dev, 0x0180);
6792 break; 6788 break;
6793 case SENSOR_OV7620: 6789 case SENSOR_OV7620:
@@ -6795,7 +6791,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
6795 reg_w(gspca_dev, 0x15, 0x01ae); 6791 reg_w(gspca_dev, 0x15, 0x01ae);
6796 i2c_read(gspca_dev, 0x13); /*fixme: returns 0xa3 */ 6792 i2c_read(gspca_dev, 0x13); /*fixme: returns 0xa3 */
6797 i2c_write(gspca_dev, 0x13, 0xa3, 0x00); 6793 i2c_write(gspca_dev, 0x13, 0xa3, 0x00);
6798 /*fixme: returned value to send? */ 6794 /*fixme: returned value to send? */
6799 reg_w(gspca_dev, 0x40, 0x0117); 6795 reg_w(gspca_dev, 0x40, 0x0117);
6800 reg_r(gspca_dev, 0x0180); 6796 reg_r(gspca_dev, 0x0180);
6801 break; 6797 break;
@@ -6838,7 +6834,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
6838 /* remove the webcam's header: 6834 /* remove the webcam's header:
6839 * ff d8 ff fe 00 0e 00 00 ss ss 00 01 ww ww hh hh pp pp 6835 * ff d8 ff fe 00 0e 00 00 ss ss 00 01 ww ww hh hh pp pp
6840 * - 'ss ss' is the frame sequence number (BE) 6836 * - 'ss ss' is the frame sequence number (BE)
6841 * - 'ww ww' and 'hh hh' are the window dimensions (BE) 6837 * - 'ww ww' and 'hh hh' are the window dimensions (BE)
6842 * - 'pp pp' is the packet sequence number (BE) 6838 * - 'pp pp' is the packet sequence number (BE)
6843 */ 6839 */
6844 data += 18; 6840 data += 18;