aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/pwc
diff options
context:
space:
mode:
authorTrent Piepho <xyzzy@speakeasy.org>2006-06-19 23:30:57 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-25 01:05:10 -0400
commit657de3cd32285831a56f9f96deb85c64205c42fc (patch)
tree3caea8235cc28ef10affe81277724e5a1adcf02e /drivers/media/video/pwc
parentf49ba8d7cd252eac19004e2ebe18dfffe548c2c3 (diff)
V4L/DVB (4118): Whitespace cleanups
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/pwc')
-rw-r--r--drivers/media/video/pwc/pwc-ctrl.c2
-rw-r--r--drivers/media/video/pwc/pwc-dec23.c4
-rw-r--r--drivers/media/video/pwc/pwc-if.c10
-rw-r--r--drivers/media/video/pwc/pwc-v4l.c38
4 files changed, 27 insertions, 27 deletions
diff --git a/drivers/media/video/pwc/pwc-ctrl.c b/drivers/media/video/pwc/pwc-ctrl.c
index 93306c71727..62a581399b1 100644
--- a/drivers/media/video/pwc/pwc-ctrl.c
+++ b/drivers/media/video/pwc/pwc-ctrl.c
@@ -1385,7 +1385,7 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
1385 1385
1386 ARG_IN(leds) 1386 ARG_IN(leds)
1387 ret = pwc_set_leds(pdev, ARGR(leds).led_on, ARGR(leds).led_off); 1387 ret = pwc_set_leds(pdev, ARGR(leds).led_on, ARGR(leds).led_off);
1388 break; 1388 break;
1389 } 1389 }
1390 1390
1391 1391
diff --git a/drivers/media/video/pwc/pwc-dec23.c b/drivers/media/video/pwc/pwc-dec23.c
index 39eaf58396d..9e2d91f26bf 100644
--- a/drivers/media/video/pwc/pwc-dec23.c
+++ b/drivers/media/video/pwc/pwc-dec23.c
@@ -105,7 +105,7 @@ static void build_bit_powermask_table(struct pwc_dec23_private *pdec)
105 105
106 106
107static void build_table_color(const unsigned int romtable[16][8], 107static void build_table_color(const unsigned int romtable[16][8],
108 unsigned char p0004[16][1024], 108 unsigned char p0004[16][1024],
109 unsigned char p8004[16][256]) 109 unsigned char p8004[16][256])
110{ 110{
111 int compression_mode, j, k, bit, pw; 111 int compression_mode, j, k, bit, pw;
@@ -787,7 +787,7 @@ static void DecompressBand23(struct pwc_dec23_private *pdec,
787 * 787 *
788 */ 788 */
789static void DecompressBandBayer(struct pwc_dec23_private *pdec, 789static void DecompressBandBayer(struct pwc_dec23_private *pdec,
790 const unsigned char *rawyuv, 790 const unsigned char *rawyuv,
791 unsigned char *rgbbayer, 791 unsigned char *rgbbayer,
792 unsigned int compressed_image_width, 792 unsigned int compressed_image_width,
793 unsigned int real_image_width) 793 unsigned int real_image_width)
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index 98059c8d6f6..d1cec397606 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -1064,7 +1064,7 @@ static const char *pwc_sensor_type_to_string(unsigned int sensor_type)
1064 case 0x101: 1064 case 0x101:
1065 return "PAL MR sensor"; 1065 return "PAL MR sensor";
1066 default: 1066 default:
1067 return "unknown type of sensor"; 1067 return "unknown type of sensor";
1068 } 1068 }
1069} 1069}
1070#endif 1070#endif
@@ -1696,10 +1696,10 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
1696 (device_hint[hint].pdev == NULL)) { 1696 (device_hint[hint].pdev == NULL)) {
1697 /* so far, so good... try serial number */ 1697 /* so far, so good... try serial number */
1698 if ((device_hint[hint].serial_number[0] == '*') || !strcmp(device_hint[hint].serial_number, serial_number)) { 1698 if ((device_hint[hint].serial_number[0] == '*') || !strcmp(device_hint[hint].serial_number, serial_number)) {
1699 /* match! */ 1699 /* match! */
1700 video_nr = device_hint[hint].device_node; 1700 video_nr = device_hint[hint].device_node;
1701 PWC_DEBUG_PROBE("Found hint, will try to register as /dev/video%d\n", video_nr); 1701 PWC_DEBUG_PROBE("Found hint, will try to register as /dev/video%d\n", video_nr);
1702 break; 1702 break;
1703 } 1703 }
1704 } 1704 }
1705 } 1705 }
diff --git a/drivers/media/video/pwc/pwc-v4l.c b/drivers/media/video/pwc/pwc-v4l.c
index 9432cbc0e6f..b7eb3ce3b96 100644
--- a/drivers/media/video/pwc/pwc-v4l.c
+++ b/drivers/media/video/pwc/pwc-v4l.c
@@ -676,9 +676,9 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
676 break; 676 break;
677 } 677 }
678 678
679 /* V4L2 Layer */ 679 /* V4L2 Layer */
680 case VIDIOC_QUERYCAP: 680 case VIDIOC_QUERYCAP:
681 { 681 {
682 struct v4l2_capability *cap = arg; 682 struct v4l2_capability *cap = arg;
683 683
684 PWC_DEBUG_IOCTL("ioctl(VIDIOC_QUERYCAP) This application "\ 684 PWC_DEBUG_IOCTL("ioctl(VIDIOC_QUERYCAP) This application "\
@@ -694,8 +694,8 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
694 return 0; 694 return 0;
695 } 695 }
696 696
697 case VIDIOC_ENUMINPUT: 697 case VIDIOC_ENUMINPUT:
698 { 698 {
699 struct v4l2_input *i = arg; 699 struct v4l2_input *i = arg;
700 700
701 if ( i->index ) /* Only one INPUT is supported */ 701 if ( i->index ) /* Only one INPUT is supported */
@@ -706,14 +706,14 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
706 return 0; 706 return 0;
707 } 707 }
708 708
709 case VIDIOC_G_INPUT: 709 case VIDIOC_G_INPUT:
710 { 710 {
711 int *i = arg; 711 int *i = arg;
712 *i = 0; /* Only one INPUT is supported */ 712 *i = 0; /* Only one INPUT is supported */
713 return 0; 713 return 0;
714 } 714 }
715 case VIDIOC_S_INPUT: 715 case VIDIOC_S_INPUT:
716 { 716 {
717 int *i = arg; 717 int *i = arg;
718 718
719 if ( *i ) { /* Only one INPUT is supported */ 719 if ( *i ) { /* Only one INPUT is supported */
@@ -725,7 +725,7 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
725 } 725 }
726 726
727 /* TODO: */ 727 /* TODO: */
728 case VIDIOC_QUERYCTRL: 728 case VIDIOC_QUERYCTRL:
729 { 729 {
730 struct v4l2_queryctrl *c = arg; 730 struct v4l2_queryctrl *c = arg;
731 int i; 731 int i;
@@ -963,13 +963,13 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
963 963
964 case VIDIOC_ENUM_FMT: 964 case VIDIOC_ENUM_FMT:
965 { 965 {
966 struct v4l2_fmtdesc *f = arg; 966 struct v4l2_fmtdesc *f = arg;
967 int index; 967 int index;
968 968
969 if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) 969 if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
970 return -EINVAL; 970 return -EINVAL;
971 971
972 /* We only support two format: the raw format, and YUV */ 972 /* We only support two format: the raw format, and YUV */
973 index = f->index; 973 index = f->index;
974 memset(f,0,sizeof(struct v4l2_fmtdesc)); 974 memset(f,0,sizeof(struct v4l2_fmtdesc));
975 f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; 975 f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
@@ -978,23 +978,23 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
978 { 978 {
979 case 0: 979 case 0:
980 /* RAW format */ 980 /* RAW format */
981 f->pixelformat = pdev->type<=646?V4L2_PIX_FMT_PWC1:V4L2_PIX_FMT_PWC2; 981 f->pixelformat = pdev->type<=646?V4L2_PIX_FMT_PWC1:V4L2_PIX_FMT_PWC2;
982 f->flags = V4L2_FMT_FLAG_COMPRESSED; 982 f->flags = V4L2_FMT_FLAG_COMPRESSED;
983 strlcpy(f->description,"Raw Philips Webcam",sizeof(f->description)); 983 strlcpy(f->description,"Raw Philips Webcam",sizeof(f->description));
984 break; 984 break;
985 case 1: 985 case 1:
986 f->pixelformat = V4L2_PIX_FMT_YUV420; 986 f->pixelformat = V4L2_PIX_FMT_YUV420;
987 strlcpy(f->description,"4:2:0, planar, Y-Cb-Cr",sizeof(f->description)); 987 strlcpy(f->description,"4:2:0, planar, Y-Cb-Cr",sizeof(f->description));
988 break; 988 break;
989 default: 989 default:
990 return -EINVAL; 990 return -EINVAL;
991 } 991 }
992 return 0; 992 return 0;
993 } 993 }
994 994
995 case VIDIOC_G_FMT: 995 case VIDIOC_G_FMT:
996 { 996 {
997 struct v4l2_format *f = arg; 997 struct v4l2_format *f = arg;
998 998
999 PWC_DEBUG_IOCTL("ioctl(VIDIOC_G_FMT) return size %dx%d\n",pdev->image.x,pdev->image.y); 999 PWC_DEBUG_IOCTL("ioctl(VIDIOC_G_FMT) return size %dx%d\n",pdev->image.x,pdev->image.y);
1000 if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) 1000 if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
@@ -1008,7 +1008,7 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
1008 case VIDIOC_TRY_FMT: 1008 case VIDIOC_TRY_FMT:
1009 return pwc_vidioc_try_fmt(pdev, arg); 1009 return pwc_vidioc_try_fmt(pdev, arg);
1010 1010
1011 case VIDIOC_S_FMT: 1011 case VIDIOC_S_FMT:
1012 return pwc_vidioc_set_fmt(pdev, arg); 1012 return pwc_vidioc_set_fmt(pdev, arg);
1013 1013
1014 case VIDIOC_G_STD: 1014 case VIDIOC_G_STD: