diff options
author | Oliver Endriss <o.endriss@gmx.de> | 2009-04-29 22:25:07 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 17:21:02 -0400 |
commit | ea3b73dc13d87d92e805f439f3d7bfcb5865db06 (patch) | |
tree | bfd0ed450f586ec458684d05987c711683d2c0c2 | |
parent | e76ef133522df8ad566d3e176a363ed006ff6829 (diff) |
V4L/DVB (11763): dvb-ttpci: Some whitespace adjustments
Some whitespace adjustments.
Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/dvb/ttpci/av7110_av.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/drivers/media/dvb/ttpci/av7110_av.c b/drivers/media/dvb/ttpci/av7110_av.c index a5ad9b0be9f9..53884814161c 100644 --- a/drivers/media/dvb/ttpci/av7110_av.c +++ b/drivers/media/dvb/ttpci/av7110_av.c | |||
@@ -1126,7 +1126,6 @@ static int dvb_video_ioctl(struct inode *inode, struct file *file, | |||
1126 | if (ret) | 1126 | if (ret) |
1127 | break; | 1127 | break; |
1128 | } | 1128 | } |
1129 | |||
1130 | if (av7110->videostate.stream_source == VIDEO_SOURCE_MEMORY) { | 1129 | if (av7110->videostate.stream_source == VIDEO_SOURCE_MEMORY) { |
1131 | if (av7110->playing == RP_AV) { | 1130 | if (av7110->playing == RP_AV) { |
1132 | ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, __Stop, 0); | 1131 | ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, __Stop, 0); |
@@ -1186,20 +1185,16 @@ static int dvb_video_ioctl(struct inode *inode, struct file *file, | |||
1186 | case VIDEO_SET_DISPLAY_FORMAT: | 1185 | case VIDEO_SET_DISPLAY_FORMAT: |
1187 | { | 1186 | { |
1188 | video_displayformat_t format = (video_displayformat_t) arg; | 1187 | video_displayformat_t format = (video_displayformat_t) arg; |
1189 | |||
1190 | switch (format) { | 1188 | switch (format) { |
1191 | case VIDEO_PAN_SCAN: | 1189 | case VIDEO_PAN_SCAN: |
1192 | av7110->display_panscan = VID_PAN_SCAN_PREF; | 1190 | av7110->display_panscan = VID_PAN_SCAN_PREF; |
1193 | break; | 1191 | break; |
1194 | |||
1195 | case VIDEO_LETTER_BOX: | 1192 | case VIDEO_LETTER_BOX: |
1196 | av7110->display_panscan = VID_VC_AND_PS_PREF; | 1193 | av7110->display_panscan = VID_VC_AND_PS_PREF; |
1197 | break; | 1194 | break; |
1198 | |||
1199 | case VIDEO_CENTER_CUT_OUT: | 1195 | case VIDEO_CENTER_CUT_OUT: |
1200 | av7110->display_panscan = VID_CENTRE_CUT_PREF; | 1196 | av7110->display_panscan = VID_CENTRE_CUT_PREF; |
1201 | break; | 1197 | break; |
1202 | |||
1203 | default: | 1198 | default: |
1204 | ret = -EINVAL; | 1199 | ret = -EINVAL; |
1205 | } | 1200 | } |
@@ -1272,7 +1267,6 @@ static int dvb_video_ioctl(struct inode *inode, struct file *file, | |||
1272 | case VIDEO_CLEAR_BUFFER: | 1267 | case VIDEO_CLEAR_BUFFER: |
1273 | dvb_ringbuffer_flush_spinlock_wakeup(&av7110->avout); | 1268 | dvb_ringbuffer_flush_spinlock_wakeup(&av7110->avout); |
1274 | av7110_ipack_reset(&av7110->ipack[1]); | 1269 | av7110_ipack_reset(&av7110->ipack[1]); |
1275 | |||
1276 | if (av7110->playing == RP_AV) { | 1270 | if (av7110->playing == RP_AV) { |
1277 | ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, | 1271 | ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, |
1278 | __Play, 2, AV_PES, 0); | 1272 | __Play, 2, AV_PES, 0); |
@@ -1293,13 +1287,13 @@ static int dvb_video_ioctl(struct inode *inode, struct file *file, | |||
1293 | break; | 1287 | break; |
1294 | 1288 | ||
1295 | case VIDEO_SET_STREAMTYPE: | 1289 | case VIDEO_SET_STREAMTYPE: |
1296 | |||
1297 | break; | 1290 | break; |
1298 | 1291 | ||
1299 | default: | 1292 | default: |
1300 | ret = -ENOIOCTLCMD; | 1293 | ret = -ENOIOCTLCMD; |
1301 | break; | 1294 | break; |
1302 | } | 1295 | } |
1296 | |||
1303 | return ret; | 1297 | return ret; |
1304 | } | 1298 | } |
1305 | 1299 | ||
@@ -1374,7 +1368,6 @@ static int dvb_audio_ioctl(struct inode *inode, struct file *file, | |||
1374 | 1368 | ||
1375 | case AUDIO_CHANNEL_SELECT: | 1369 | case AUDIO_CHANNEL_SELECT: |
1376 | av7110->audiostate.channel_select = (audio_channel_select_t) arg; | 1370 | av7110->audiostate.channel_select = (audio_channel_select_t) arg; |
1377 | |||
1378 | switch(av7110->audiostate.channel_select) { | 1371 | switch(av7110->audiostate.channel_select) { |
1379 | case AUDIO_STEREO: | 1372 | case AUDIO_STEREO: |
1380 | ret = audcom(av7110, AUDIO_CMD_STEREO); | 1373 | ret = audcom(av7110, AUDIO_CMD_STEREO); |
@@ -1385,7 +1378,6 @@ static int dvb_audio_ioctl(struct inode *inode, struct file *file, | |||
1385 | msp_writereg(av7110, MSP_WR_DSP, 0x0008, 0x0220); | 1378 | msp_writereg(av7110, MSP_WR_DSP, 0x0008, 0x0220); |
1386 | } | 1379 | } |
1387 | break; | 1380 | break; |
1388 | |||
1389 | case AUDIO_MONO_LEFT: | 1381 | case AUDIO_MONO_LEFT: |
1390 | ret = audcom(av7110, AUDIO_CMD_MONO_L); | 1382 | ret = audcom(av7110, AUDIO_CMD_MONO_L); |
1391 | if (!ret) { | 1383 | if (!ret) { |
@@ -1395,7 +1387,6 @@ static int dvb_audio_ioctl(struct inode *inode, struct file *file, | |||
1395 | msp_writereg(av7110, MSP_WR_DSP, 0x0008, 0x0200); | 1387 | msp_writereg(av7110, MSP_WR_DSP, 0x0008, 0x0200); |
1396 | } | 1388 | } |
1397 | break; | 1389 | break; |
1398 | |||
1399 | case AUDIO_MONO_RIGHT: | 1390 | case AUDIO_MONO_RIGHT: |
1400 | ret = audcom(av7110, AUDIO_CMD_MONO_R); | 1391 | ret = audcom(av7110, AUDIO_CMD_MONO_R); |
1401 | if (!ret) { | 1392 | if (!ret) { |
@@ -1405,7 +1396,6 @@ static int dvb_audio_ioctl(struct inode *inode, struct file *file, | |||
1405 | msp_writereg(av7110, MSP_WR_DSP, 0x0008, 0x0210); | 1396 | msp_writereg(av7110, MSP_WR_DSP, 0x0008, 0x0210); |
1406 | } | 1397 | } |
1407 | break; | 1398 | break; |
1408 | |||
1409 | default: | 1399 | default: |
1410 | ret = -EINVAL; | 1400 | ret = -EINVAL; |
1411 | break; | 1401 | break; |
@@ -1431,21 +1421,24 @@ static int dvb_audio_ioctl(struct inode *inode, struct file *file, | |||
1431 | ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, | 1421 | ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, |
1432 | __Play, 2, AV_PES, 0); | 1422 | __Play, 2, AV_PES, 0); |
1433 | break; | 1423 | break; |
1434 | case AUDIO_SET_ID: | ||
1435 | 1424 | ||
1425 | case AUDIO_SET_ID: | ||
1436 | break; | 1426 | break; |
1427 | |||
1437 | case AUDIO_SET_MIXER: | 1428 | case AUDIO_SET_MIXER: |
1438 | { | 1429 | { |
1439 | struct audio_mixer *amix = (struct audio_mixer *)parg; | 1430 | struct audio_mixer *amix = (struct audio_mixer *)parg; |
1440 | |||
1441 | ret = av7110_set_volume(av7110, amix->volume_left, amix->volume_right); | 1431 | ret = av7110_set_volume(av7110, amix->volume_left, amix->volume_right); |
1442 | break; | 1432 | break; |
1443 | } | 1433 | } |
1434 | |||
1444 | case AUDIO_SET_STREAMTYPE: | 1435 | case AUDIO_SET_STREAMTYPE: |
1445 | break; | 1436 | break; |
1437 | |||
1446 | default: | 1438 | default: |
1447 | ret = -ENOIOCTLCMD; | 1439 | ret = -ENOIOCTLCMD; |
1448 | } | 1440 | } |
1441 | |||
1449 | return ret; | 1442 | return ret; |
1450 | } | 1443 | } |
1451 | 1444 | ||