Skip to content

Commit

Permalink
[PATCH] dvb: ttpci: cleanup indentation + whitespace
Browse files Browse the repository at this point in the history 
Fix indentation and add some whitepsace between operators.

Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Johannes Stezenbach authored and Linus Torvalds committed Jul 8, 2005
1 parent 12ba050 commit 7a2fa90
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
12 changes: 6 additions & 6 deletions drivers/media/dvb/ttpci/av7110.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,11 @@ static void init_av7110_av(struct av7110 *av7110)
/* set internal volume control to maximum */
av7110->adac_type = DVB_ADAC_TI;
ret = av7110_set_volume(av7110, av7110->mixer.volume_left, av7110->mixer.volume_right);
if (ret<0)
if (ret < 0)
printk("dvb-ttpci:cannot set internal volume to maximum:%d\n",ret);

ret = av7710_set_video_mode(av7110, vidmode);
if (ret<0)
if (ret < 0)
printk("dvb-ttpci:cannot set video mode:%d\n",ret);

/* handle different card types */
Expand Down Expand Up @@ -162,10 +162,10 @@ static void init_av7110_av(struct av7110 *av7110)
if (av7110->adac_type == DVB_ADAC_NONE || av7110->adac_type == DVB_ADAC_MSP) {
// switch DVB SCART on
ret = av7110_fw_cmd(av7110, COMTYPE_AUDIODAC, MainSwitch, 1, 0);
if (ret<0)
if (ret < 0)
printk("dvb-ttpci:cannot switch on SCART(Main):%d\n",ret);
ret = av7110_fw_cmd(av7110, COMTYPE_AUDIODAC, ADSwitch, 1, 1);
if (ret<0)
if (ret < 0)
printk("dvb-ttpci:cannot switch on SCART(AD):%d\n",ret);
if (rgb_on &&
(av7110->dev->pci->subsystem_vendor == 0x110a) && (av7110->dev->pci->subsystem_device == 0x0000)) {
Expand All @@ -175,10 +175,10 @@ static void init_av7110_av(struct av7110 *av7110)
}

ret = av7110_set_volume(av7110, av7110->mixer.volume_left, av7110->mixer.volume_right);
if (ret<0)
if (ret < 0)
printk("dvb-ttpci:cannot set volume :%d\n",ret);
ret = av7110_setup_irc_config(av7110, 0);
if (ret<0)
if (ret < 0)
printk("dvb-ttpci:cannot setup irc config :%d\n",ret);
}

Expand Down
10 changes: 5 additions & 5 deletions drivers/media/dvb/ttpci/av7110_av.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,7 @@ static int dvb_video_ioctl(struct inode *inode, struct file *file,
//note: arg is ignored by firmware
if (av7110->playing & RP_VIDEO)
ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY,
__Scan_I, 2, AV_PES, 0);
__Scan_I, 2, AV_PES, 0);
else
ret = vidcom(av7110, VIDEO_CMD_FFWD, arg);
if (!ret) {
Expand Down Expand Up @@ -1164,15 +1164,15 @@ static int dvb_video_ioctl(struct inode *inode, struct file *file,

if (av7110->playing == RP_AV) {
ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY,
__Play, 2, AV_PES, 0);
__Play, 2, AV_PES, 0);
if (ret)
break;
if (av7110->trickmode == TRICK_FAST)
ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY,
__Scan_I, 2, AV_PES, 0);
__Scan_I, 2, AV_PES, 0);
if (av7110->trickmode == TRICK_SLOW) {
ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY,
__Slow, 2, 0, 0);
__Slow, 2, 0, 0);
if (!ret)
ret = vidcom(av7110, VIDEO_CMD_SLOW, arg);
}
Expand Down Expand Up @@ -1303,7 +1303,7 @@ static int dvb_audio_ioctl(struct inode *inode, struct file *file,
av7110_ipack_reset(&av7110->ipack[0]);
if (av7110->playing == RP_AV)
ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY,
__Play, 2, AV_PES, 0);
__Play, 2, AV_PES, 0);
break;
case AUDIO_SET_ID:

Expand Down

0 comments on commit 7a2fa90

Please sign in to comment.