Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drivers/ps3: Fix checkpatch warnings in ps3av.c

Signed-off-by: Valentin Ilie <valentin.ilie@gmail.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Geoff Levand <geoff@infradead.org>

authored by

Valentin Ilie and committed by
Geoff Levand
f02777b4 02ec92b3

+9 -15
+9 -15
drivers/ps3/ps3av.c
··· 338 338 mutex_unlock(&ps3av->mutex); 339 339 return 0; 340 340 341 - err: 341 + err: 342 342 mutex_unlock(&ps3av->mutex); 343 343 printk(KERN_ERR "%s: failed cid:%x res:%d\n", __func__, cid, res); 344 344 return res; ··· 477 477 478 478 return 0; 479 479 } 480 - 481 480 EXPORT_SYMBOL_GPL(ps3av_set_audio_mode); 482 481 483 482 static int ps3av_set_videomode(void) ··· 500 501 501 502 video_mode = &video_mode_table[id & PS3AV_MODE_MASK]; 502 503 503 - avb_param.num_of_video_pkt = PS3AV_AVB_NUM_VIDEO; /* num of head */ 504 + avb_param.num_of_video_pkt = PS3AV_AVB_NUM_VIDEO; /* num of head */ 504 505 avb_param.num_of_audio_pkt = 0; 505 506 avb_param.num_of_av_video_pkt = ps3av->av_hw_conf.num_of_hdmi + 506 507 ps3av->av_hw_conf.num_of_avmulti; ··· 520 521 #ifndef PS3AV_HDMI_YUV 521 522 if (ps3av->av_port[i] == PS3AV_CMD_AVPORT_HDMI_0 || 522 523 ps3av->av_port[i] == PS3AV_CMD_AVPORT_HDMI_1) 523 - av_video_cs = RGB8; /* use RGB for HDMI */ 524 + av_video_cs = RGB8; /* use RGB for HDMI */ 524 525 #endif 525 526 len += ps3av_cmd_set_av_video_cs(&avb_param.buf[len], 526 527 ps3av->av_port[i], ··· 589 590 #define SHIFT_VESA 8 590 591 591 592 static const struct { 592 - unsigned mask : 19; 593 - unsigned id : 4; 593 + unsigned mask:19; 594 + unsigned id:4; 594 595 } ps3av_preferred_modes[] = { 595 596 { PS3AV_RESBIT_WUXGA << SHIFT_VESA, PS3AV_MODE_WUXGA }, 596 597 { PS3AV_RESBIT_1920x1080P << SHIFT_60, PS3AV_MODE_1080P60 }, ··· 666 667 return id; 667 668 } 668 669 669 - static void ps3av_monitor_info_dump(const struct ps3av_pkt_av_get_monitor_info *monitor_info) 670 + static void ps3av_monitor_info_dump( 671 + const struct ps3av_pkt_av_get_monitor_info *monitor_info) 670 672 { 671 673 const struct ps3av_info_monitor *info = &monitor_info->info; 672 674 const struct ps3av_info_audio *audio = info->audio; ··· 717 717 718 718 /* audio block */ 719 719 for (i = 0; i < info->num_of_audio_block; i++) { 720 - pr_debug("audio[%d] type: %02x max_ch: %02x fs: %02x sbit: " 721 - "%02x\n", 720 + pr_debug( 721 + "audio[%d] type: %02x max_ch: %02x fs: %02x sbit: %02x\n", 722 722 i, audio->type, audio->max_num_of_ch, audio->fs, 723 723 audio->sbit); 724 724 audio++; ··· 870 870 871 871 return 0; 872 872 } 873 - 874 873 EXPORT_SYMBOL_GPL(ps3av_set_video_mode); 875 874 876 875 int ps3av_get_auto_mode(void) 877 876 { 878 877 return ps3av_auto_videomode(&ps3av->av_hw_conf); 879 878 } 880 - 881 879 EXPORT_SYMBOL_GPL(ps3av_get_auto_mode); 882 880 883 881 int ps3av_get_mode(void) 884 882 { 885 883 return ps3av ? ps3av->ps3av_mode : 0; 886 884 } 887 - 888 885 EXPORT_SYMBOL_GPL(ps3av_get_mode); 889 886 890 887 /* get resolution by video_mode */ ··· 899 902 *yres = video_mode_table[id].y; 900 903 return 0; 901 904 } 902 - 903 905 EXPORT_SYMBOL_GPL(ps3av_video_mode2res); 904 906 905 907 /* mute */ ··· 907 911 return ps3av_set_av_video_mute(mute ? PS3AV_CMD_MUTE_ON 908 912 : PS3AV_CMD_MUTE_OFF); 909 913 } 910 - 911 914 EXPORT_SYMBOL_GPL(ps3av_video_mute); 912 915 913 916 /* mute analog output only */ ··· 930 935 return ps3av_set_audio_mute(mute ? PS3AV_CMD_MUTE_ON 931 936 : PS3AV_CMD_MUTE_OFF); 932 937 } 933 - 934 938 EXPORT_SYMBOL_GPL(ps3av_audio_mute); 935 939 936 940 static int __devinit ps3av_probe(struct ps3_system_bus_device *dev)