staging: media: av7110: fix coding style
Subsystems (2)
PATCH v6 1/1 staging: media: av7110: fix coding style
Fix indentation and alignment issues reported by checkpatch.pl.
Rename enums av7110_rec_play_state, av7110_type_rec_play_format, and av7110_encoder_command to follow kernel naming style.
Rename wssData and wssMode to wss_data and wss_mode to avoid camelCase identifiers.
---
v6:
- Rename wssMode
- Group av7110_fw_cmd parameters logically
v5:
- Limit lines to 80 columns
- Add trailing commas to enums av7110_rec_play_state,
av7110_type_rec_play_format, av7110_encoder_command
- Remove unnecessary cast
v4:
- Fix coding style issues reported by checkpatch.pl
v3:
- Fix coding style and alignment issues reported by checkpatch.pl
- Rename av7110_pid_command, av7110_type_rec_play_format, av7110_encoder_command to follow kernel naming style
v2:
- Fix indentation issues reported by checkpatch.pl
- Rename av7110_rec_play_state to follow kernel naming style
--- drivers/staging/media/av7110/av7110.c | 31 +++++--- drivers/staging/media/av7110/av7110.h | 4 +- drivers/staging/media/av7110/av7110_av.c | 91 +++++++++++++++-------- drivers/staging/media/av7110/av7110_ca.c | 3 +- drivers/staging/media/av7110/av7110_hw.h | 71 +++++++++--------- drivers/staging/media/av7110/av7110_ir.c | 4 +- drivers/staging/media/av7110/av7110_v4l.c | 22 +++--- 7 files changed, 135 insertions(+), 91 deletions(-)
drivers/staging/media/av7110/av7110.c +19 -12
@@ -121,19 +121,22 @@ static void init_av7110_av(struct av7110 *av7110)if (ret <0 )pr_err ("cannot set internal volume to maximum:%d\n" , ret); - ret =av7110_fw_cmd (av7110,COMTYPE_ENCODER , SetMonitorType, -1 , (u16 )av7110->display_ar); + ret =av7110_fw_cmd (av7110,COMTYPE_ENCODER , +AV7110_SET_MONITOR_TYPE ,1 , av7110->display_ar);if (ret <0 )pr_err ("unable to set aspect ratio\n" ); - ret =av7110_fw_cmd (av7110,COMTYPE_ENCODER , SetPanScanType, -1 , av7110->display_panscan); + ret =av7110_fw_cmd (av7110,COMTYPE_ENCODER , +AV7110_SET_PANSCAN_TYPE ,1 , + av7110->display_panscan);if (ret <0 )pr_err ("unable to set pan scan\n" ); - ret =av7110_fw_cmd (av7110,COMTYPE_ENCODER , SetWSSConfig,2 ,2 , wss_cfg_4_3); + ret =av7110_fw_cmd (av7110,COMTYPE_ENCODER , +AV7110_SET_WSS_CONFIG ,2 ,2 , wss_cfg_4_3);if (ret <0 )pr_err ("unable to configure 4:3 wss\n" ); - ret =av7110_fw_cmd (av7110,COMTYPE_ENCODER , SetWSSConfig,2 ,3 , wss_cfg_16_9); + ret =av7110_fw_cmd (av7110,COMTYPE_ENCODER , +AV7110_SET_WSS_CONFIG ,2 ,3 , wss_cfg_16_9);if (ret <0 )pr_err ("unable to configure 16:9 wss\n" );
@@ -717,7 +720,8 @@ static inline int SetPIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid,if (av7110->audiostate.bypass_mode) aflags |=0x8000 ; -return av7110_fw_cmd (av7110,COMTYPE_PIDFILTER , MultiPID,6 , +return av7110_fw_cmd (av7110,COMTYPE_PIDFILTER , +AV7110_MULTI_PID ,6 , pcrpid, vpid, apid, ttpid, subpid, aflags); }
@@ -785,7 +789,7 @@ static int StartHWFilter(struct dvb_demux_filter *dvbdmxfilter)av7110_p2t_init (&av7110->p2t_filter[dvbdmxfilter->index], dvbdmxfeed); } - buf[0 ] = (COMTYPE_PID_FILTER <<8 ) + AddPIDFilter; + buf[0 ] = (COMTYPE_PID_FILTER <<8 ) +AV7110_ADD_PID_FILTER ; buf[1 ] =16 ; buf[2 ] = dvbdmxfeed->pid; buf[3 ] = mode;
@@ -828,7 +832,7 @@ static int StopHWFilter(struct dvb_demux_filter *dvbdmxfilter) av7110->handle2filter[handle] =NULL ; - buf[0 ] = (COMTYPE_PID_FILTER <<8 ) + DelPIDFilter; + buf[0 ] = (COMTYPE_PID_FILTER <<8 ) +AV7110_DEL_PID_FILTER ; buf[1 ] =1 ; buf[2 ] = handle; ret =av7110_fw_request (av7110, buf,3 , answ,2 );
@@ -873,7 +877,8 @@ static int dvb_feed_start_pid(struct dvb_demux_feed *dvbdmxfeed)if (dvbdmxfeed->pes_type <2 && npids[0 ])if (av7110->fe_synced) { - ret =av7110_fw_cmd (av7110,COMTYPE_PIDFILTER , Scan,0 ); + ret =av7110_fw_cmd (av7110,COMTYPE_PIDFILTER , +AV7110_SCAN ,0 );if (ret)return ret; }
@@ -1911,11 +1916,13 @@ static int av7110_fe_lock_fix(struct av7110 *av7110, enum fe_status status) av7110->pids[DMX_PES_TELETEXT ],0 , av7110->pids[DMX_PES_PCR]);if (!ret) - ret =av7110_fw_cmd (av7110,COMTYPE_PIDFILTER , Scan,0 ); + ret =av7110_fw_cmd (av7110,COMTYPE_PIDFILTER , +AV7110_SCAN ,0 ); }else { ret =SetPIDs (av7110,0 ,0 ,0 ,0 ,0 );if (!ret) { - ret =av7110_fw_cmd (av7110,COMTYPE_PID_FILTER , FlushTSQueue,0 ); + ret =av7110_fw_cmd (av7110,COMTYPE_PID_FILTER , +AV7110_FLUSH_TS_QUEUE ,0 );if (!ret) ret =av7110_wait_msgstate (av7110, GPMQBusy); }
drivers/staging/media/av7110/av7110.h +2 -2
@@ -243,8 +243,8 @@ struct av7110 {struct dvb_video_events video_events;video_size_t video_size; -u16 wssMode; -u16 wssData; +u16 wss_mode; +u16 wss_data;struct infrared ir;
drivers/staging/media/av7110/av7110_av.c +62 -29
231 lines not on this page · raw message
drivers/staging/media/av7110/av7110_ca.c +2 -1
@@ -307,7 +307,8 @@ static int dvb_ca_ioctl(struct file *file, unsigned int cmd, void *parg)mutex_unlock (&av7110->ioctl_mutex);return -EINVAL ; } - av7110_fw_cmd(av7110, COMTYPE_PIDFILTER, SetDescr, 5, + av7110_fw_cmd(av7110, COMTYPE_PIDFILTER, + AV7110_SET_DESCR, 5, (descr->index << 8) | descr->parity, (descr->cw[0] << 8) | descr->cw[1], (descr->cw[2] << 8) | descr->cw[3],
drivers/staging/media/av7110/av7110_hw.h +36 -35
98 lines not on this page · raw message
drivers/staging/media/av7110/av7110_ir.c +2 -2
@@ -71,8 +71,8 @@ int av7110_set_ir_config(struct av7110 *av7110) {dprintk (4 ,"ir config = %08x\n" , av7110->ir.ir_config); -return av7110_fw_cmd (av7110,COMTYPE_PIDFILTER , SetIR,1 , - av7110->ir.ir_config); +return av7110_fw_cmd (av7110,COMTYPE_PIDFILTER , +AV7110_SET_IR ,1 , av7110->ir.ir_config); }static int change_protocol (struct rc_dev *rcdev,u64 *rc_type)
drivers/staging/media/av7110/av7110_v4l.c +12 -10
@@ -556,7 +556,7 @@ static int vidioc_g_fmt_sliced_vbi_out(struct file *file, void *fh,if (FW_VERSION (av7110->arm_app) <0x2623 )return -EINVAL ;memset (&f->fmt.sliced,0 ,sizeof (f->fmt.sliced)); -if (av7110->wssMode) { +if (av7110->wss_mode) { f->fmt.sliced.service_set =V4L2_SLICED_WSS_625 ; f->fmt.sliced.service_lines[0 ][23 ] =V4L2_SLICED_WSS_625 ; }
@@ -596,14 +596,14 @@ static int vidioc_s_fmt_sliced_vbi_out(struct file *file, void *fh,return -EINVAL ;if (f->fmt.sliced.service_set &V4L2_SLICED_WSS_625 ) {/* WSS controlled by userspace */ - av7110->wssMode =1 ; - av7110->wssData =0 ; + av7110->wss_mode =1 ; + av7110->wss_data =0 ; }else {/* WSS controlled by firmware */ - av7110->wssMode =0 ; - av7110->wssData =0 ; + av7110->wss_mode =0 ; + av7110->wss_data =0 ;return av7110_fw_cmd (av7110,COMTYPE_ENCODER , - SetWSSConfig,1 ,0 ); +AV7110_SET_WSS_CONFIG ,1 ,0 ); }return 0 ; }
@@ -616,17 +616,19 @@ static ssize_t av7110_vbi_write(struct file *file, const char __user *data, sizeint rc;dprintk (2 ,"\n" ); -if (FW_VERSION (av7110->arm_app) <0x2623 || !av7110->wssMode || count !=sizeof (d)) +if (FW_VERSION (av7110->arm_app) <0x2623 || + !av7110->wss_mode || count !=sizeof (d))return -EINVAL ;if (copy_from_user (&d, data, count))return -EFAULT ;if ((d.id !=0 && d.id !=V4L2_SLICED_WSS_625 ) || d.field !=0 || d.line !=23 )return -EINVAL ;if (d.id) - av7110->wssData = ((d.data[1 ] <<8 ) &0x3f00 ) | d.data[0 ]; + av7110->wss_data = ((d.data[1 ] <<8 ) &0x3f00 ) | d.data[0 ];else - av7110->wssData =0x8000 ; - rc =av7110_fw_cmd (av7110,COMTYPE_ENCODER , SetWSSConfig,2 ,1 , av7110->wssData); + av7110->wss_data =0x8000 ; + rc =av7110_fw_cmd (av7110,COMTYPE_ENCODER , +AV7110_SET_WSS_CONFIG ,2 ,1 , av7110->wss_data);return (rc <0 ) ? rc : count; }
Signature · 1 line
2.25.1
Quoted 7 lines · Chethan C
Fix indentation and alignment issues reported by checkpatch.pl.
Rename enums
av7110_rec_play_state,av7110_type_rec_play_format, andav7110_encoder_commandto follow kernel naming style.Rename wssData and wssMode to
wss_dataandwss_modeto avoid camelCase identifiers.
TL;DR: one hunk should be not touched (see below). Otherwise LGTM.
...
drivers/staging/media/av7110/av7110_av.c static ssize_t dvb_aplay(struct av7110 *av7110, const char __user *buf, · line 576
Quoted 6 lines
drivers/staging/media/av7110/av7110_av.c +1
-1@@ -551,7 +573,7 @@ static ssize_t dvb_aplay(struct av7110 *av7110, const char __user *buf,if (nonblock)return count - todo;if (wait_event_interruptible (av7110->aout.queue, - (dvb_ringbuffer_free (&av7110->aout) >=20 *1024 ))) + (dvb_ringbuffer_free (&av7110->aout) >=20 *1024 )))
This change is wrong.
Also one may consider to replace 20*1024 with proper HZ-dependent value. (But the latter one should be done separately.)
Quoted 2 lines
(quoted diff) +0
-0return count - todo; }
...
drivers/staging/media/av7110/av7110_v4l.c static ssize_t av7110_vbi_write(struct file *file, const char __user *data, size · line 627
Quoted 2 lines
drivers/staging/media/av7110/av7110_v4l.c +1
-1- av7110->wssData = ((d.data[1 ] <<8 ) &0x3f00 ) | d.data[0 ]; + av7110->wss_data = ((d.data[1 ] <<8 ) &0x3f00 ) | d.data[0 ];
Another side note: This kind of changes can be properly converted to use get_unaligned_le16() & GENMASK(). But it's another story.
Signature · 2 lines
With Best Regards, Andy Shevchenko