Skip to contentSkip to conversation

staging: media: av7110: fix coding style

PATCH Superseded Chethan C 2 participants 2 messages Mar 21 – Mar 23

Subsystems (2)

v3 of 7 Superseded Latest is v7 →

lore
Share & tools
lore

Chethan C

author
#0 lore raw

PATCH v3 1/1 staging: media: av7110: fix coding style

Fixed Indentation, Alignment issues reported by checkpatch.pl.

Renamed enum av7110_rec_play_state, av7110_type_rec_play_format, av7110_encoder_command from camel case to upper case underscore style to comply kernel style guidelines.

---
v3:
- fixed the coding style and alignment issues reported by checkpatch.pl
- Renamed av7110_pid_command,av7110_type_rec_play_format, av7110_encoder_command to follow kernel naming style
v2:
- fixed indentation issues reported by checkpatch.pl
- Rename av7110_rec_play_state to follow kernel naming style

---
 drivers/staging/media/av7110/av7110.c     |  20 ++--
 drivers/staging/media/av7110/av7110_av.c  | 117 +++++++++++++++++-----
 drivers/staging/media/av7110/av7110_ca.c  |   2 +-
 drivers/staging/media/av7110/av7110_hw.h  |  70 ++++++-------
 drivers/staging/media/av7110/av7110_ir.c  |   2 +-
 drivers/staging/media/av7110/av7110_v4l.c |   4 +-
 6 files changed, 139 insertions(+), 76 deletions(-)
drivers/staging/media/av7110/av7110.c +10 -10
index 607992100baf..86a654cc2b63 100644
@@ -121,19 +121,19 @@ 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,
+	ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, AV7110_SET_MONITOR_TYPE,
 			    1, (u16)av7110->display_ar);
 	if (ret < 0)
 		pr_err("unable to set aspect ratio\n");
-	ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetPanScanType,
+	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 +717,7 @@ 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 +785,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 +828,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 +873,7 @@ 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 +1911,11 @@ 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_av.c +90 -27

257 lines not on this page · raw message

drivers/staging/media/av7110/av7110_ca.c +1 -1
index 63d9c97a5190..9413a6a7f387 100644
@@ -307,7 +307,7 @@ 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 +35 -35

97 lines not on this page · raw message

drivers/staging/media/av7110/av7110_ir.c +1 -1
index 68b3979ba5f2..16b8ac5ab5a1 100644
@@ -71,7 +71,7 @@ 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,
+	return av7110_fw_cmd(av7110, COMTYPE_PIDFILTER, AV7110_SET_IR, 1,
 			     av7110->ir.ir_config);
 }
 
drivers/staging/media/av7110/av7110_v4l.c +2 -2
index 200a7a29ea31..959bc6f98bd3 100644
@@ -603,7 +603,7 @@ static int vidioc_s_fmt_sliced_vbi_out(struct file *file, void *fh,
 		av7110->wssMode = 0;
 		av7110->wssData = 0;
 		return av7110_fw_cmd(av7110, COMTYPE_ENCODER,
-				     SetWSSConfig, 1, 0);
+				     AV7110_SET_WSS_CONFIG, 1, 0);
 	}
 	return 0;
 }
@@ -626,7 +626,7 @@ static ssize_t av7110_vbi_write(struct file *file, const char __user *data, size
 		av7110->wssData = ((d.data[1] << 8) & 0x3f00) | d.data[0];
 	else
 		av7110->wssData = 0x8000;
-	rc = av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetWSSConfig, 2, 1, av7110->wssData);
+	rc = av7110_fw_cmd(av7110, COMTYPE_ENCODER, AV7110_SET_WSS_CONFIG, 2, 1, av7110->wssData);
 	return (rc < 0) ? rc : count;
 }
 
Signature · 1 line
2.25.1
#1 lore raw
Quoted 5 lines · Chethan C

Fixed Indentation, Alignment issues reported by checkpatch.pl.

Renamed enum av7110_rec_play_state, av7110_type_rec_play_format, av7110_encoder_command from camel case to upper case underscore style to comply kernel style guidelines.

Some changes are questionable, some need improvement, see a bit below.

...

drivers/staging/media/av7110/av7110.c static void init_av7110_av(struct av7110 *av7110) · line 125

Quoted 2 lines
drivers/staging/media/av7110/av7110.c +1 -0
+	ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, AV7110_SET_MONITOR_TYPE,
 			    1, (u16)av7110->display_ar);

Also check if you need a casting.

Quoted 2 lines
(quoted diff) +0 -0
 	if (ret < 0)
 		pr_err("unable to set aspect ratio\n");

...

drivers/staging/media/av7110/av7110.c static void init_av7110_av(struct av7110 *av7110) · line 133

Quoted 2 lines
drivers/staging/media/av7110/av7110.c +1 -1
-	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);

The media subsystem is strict about 80 character limit. Yes, the original is also long, but this makes it worse. Same for other similar cases.

Quoted 2 lines
(quoted diff) +0 -0
 	if (ret < 0)
 		pr_err("unable to configure 4:3 wss\n");

...

drivers/staging/media/av7110/av7110_av.c int av7110_av_start_record(struct av7110 *av7110, int av, · line 128

Quoted 6 lines
drivers/staging/media/av7110/av7110_av.c +5 -1
-		ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, __Record, 2, AudioPES, 0);
+		ret = av7110_fw_cmd(av7110,
+				    COMTYPE_REC_PLAY,
+				    AV7110_REC_PLAY_RECORD,
+				    2,
+				    AV7110_AUDIO_PES, 0);

Here and in some other places out of a sudden the style is changed to "one parameter per line", why?

...

drivers/staging/media/av7110/av7110_hw.h enum av7110_bootstate { · line 29

Quoted 13 lines

enum av7110_type_rec_play_format {

drivers/staging/media/av7110/av7110_hw.h +6 -6
-	RP_None,
-	AudioPES,
-	AudioMp2,
-	AudioPCM,
-	VideoPES,
-	AV_PES
+	AV7110_RP_NONE,
+	AV7110_AUDIO_PES,
+	AV7110_AUDIO_MP2,
+	AV7110_AUDIO_PCM,
+	AV7110_VIDEO_PES,
+	AV7110_AV_PES

While there is no comma in the original, this is not a terminator entry, so while at it, add trailing comma.

Quoted 1 line

};

...

Quoted 18 lines

enum av7110_pid_command {

drivers/staging/media/av7110/av7110_hw.h +4 -13
-	MultiPID,
-	VideoPID,
-	AudioPID,
-	InitFilt,
-	FiltError,
-	NewVersion,
-	CacheError,
-	AddPIDFilter,
-	DelPIDFilter,
-	Scan,
-	SetDescr,
-	SetIR,
-	FlushTSQueue
+	AV7110_MULTI_PID,
+	AV7110_VIDEO_PID,
+	AV7110_AUDIO_PID,
+	AV7110_INIT_FILT,

drivers/staging/media/av7110/av7110_hw.h enum av7110_osd_command { · line 128

Quoted 10 lines
drivers/staging/media/av7110/av7110_hw.h +9 -0
+	AV7110_FILT_ERROR,
+	AV7110_NEW_VERSION,
+	AV7110_CACHE_ERROR,
+	AV7110_ADD_PID_FILTER,
+	AV7110_DEL_PID_FILTER,
+	AV7110_SCAN,
+	AV7110_SET_DESCR,
+	AV7110_SET_IR,
+	AV7110_FLUSH_TS_QUEUE
 };

Ditto.

...

Quoted 6 lines

enum av7110_encoder_command {

drivers/staging/media/av7110/av7110_hw.h +0 -5
-	SetVidMode,
-	SetTestMode,
-	LoadVidCode,
-	SetMonitorType,
-	SetPanScanType,

drivers/staging/media/av7110/av7110_hw.h enum av7110_request_command { · line 168

Quoted 10 lines
drivers/staging/media/av7110/av7110_hw.h +7 -2
-	SetFreezeMode,
-	SetWSSConfig
+	AV7110_SET_VID_MODE,
+	AV7110_SET_TEST_MODE,
+	AV7110_LOAD_VID_CODE,
+	AV7110_SET_MONITOR_TYPE,
+	AV7110_SET_PANSCAN_TYPE,
+	AV7110_SET_FREEZE_MODE,
+	AV7110_SET_WSS_CONFIG
 };

Ditto.

Quoted 8 lines

enum av7110_rec_play_state {

drivers/staging/media/av7110/av7110_hw.h +0 -7
-	__Record,
-	__Stop,
-	__Play,
-	__Pause,
-	__Slow,
-	__FF_IP,
-	__Scan_I,

drivers/staging/media/av7110/av7110_hw.h enum av7110_request_command { · line 179

Quoted 10 lines
drivers/staging/media/av7110/av7110_hw.h +8 -1
-	__Continue
+	AV7110_REC_PLAY_RECORD,
+	AV7110_REC_PLAY_STOP,
+	AV7110_REC_PLAY_PLAY,
+	AV7110_REC_PLAY_PAUSE,
+	AV7110_REC_PLAY_SLOW,
+	AV7110_REC_PLAY_FF_IP,
+	AV7110_REC_PLAY_SCAN_I,
+	AV7110_REC_PLAY_CONTINUE
 };

Ditto.

Signature · 2 lines
With Best Regards,
Andy Shevchenko