* [PATCH v2] staging: media: av7110: fix coding style
@ 2026-03-20 19:15 Chethan.C
0 siblings, 0 replies; only message in thread
From: Chethan.C @ 2026-03-20 19:15 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Greg Kroah-Hartman, Chethan.C, linux-media,
linux-staging, linux-kernel
Fixed Indentation issues reported by checkpatch.pl.
Renamed enum av7110_rec_play_state from camel case to
upper case underscore style to comply kernel style guidelines.
Signed-off-by: Chethan.C <mail.chethan.c@gmail.com>
---
v2:
- fixed indentation issues reported by checkpatch.pl
- Rename av7110_rec_play_state to follow kernel naming style
---
drivers/staging/media/av7110/av7110_av.c | 109 ++++++++++++++++++-----
drivers/staging/media/av7110/av7110_hw.h | 16 ++--
2 files changed, 94 insertions(+), 31 deletions(-)
diff --git a/drivers/staging/media/av7110/av7110_av.c b/drivers/staging/media/av7110/av7110_av.c
index 2993ac43c49c..a7d76348318d 100644
--- a/drivers/staging/media/av7110/av7110_av.c
+++ b/drivers/staging/media/av7110/av7110_av.c
@@ -111,7 +111,7 @@ int av7110_av_start_record(struct av7110 *av7110, int av,
if (av7110->playing || (av7110->rec_mode & av))
return -EBUSY;
- av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, __Stop, 0);
+ av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, AV7110_REC_PLAY_STOP, 0);
dvbdmx->recording = 1;
av7110->rec_mode |= av;
@@ -121,7 +121,11 @@ int av7110_av_start_record(struct av7110 *av7110, int av,
dvbdmx->pesfilter[0]->pid,
dvb_filter_pes2ts_cb,
(void *)dvbdmx->pesfilter[0]);
- 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,
+ AudioPES, 0);
break;
case RP_VIDEO:
@@ -129,7 +133,12 @@ int av7110_av_start_record(struct av7110 *av7110, int av,
dvbdmx->pesfilter[1]->pid,
dvb_filter_pes2ts_cb,
(void *)dvbdmx->pesfilter[1]);
- ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, __Record, 2, VideoPES, 0);
+ ret = av7110_fw_cmd(av7110,
+ COMTYPE_REC_PLAY,
+ AV7110_REC_PLAY_RECORD,
+ 2,
+ VideoPES,
+ 0);
break;
case RP_AV:
@@ -141,7 +150,12 @@ int av7110_av_start_record(struct av7110 *av7110, int av,
dvbdmx->pesfilter[1]->pid,
dvb_filter_pes2ts_cb,
(void *)dvbdmx->pesfilter[1]);
- ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, __Record, 2, AV_PES, 0);
+ ret = av7110_fw_cmd(av7110,
+ COMTYPE_REC_PLAY,
+ AV7110_REC_PLAY_RECORD,
+ 2,
+ AV_PES,
+ 0);
break;
}
return ret;
@@ -158,7 +172,7 @@ int av7110_av_start_play(struct av7110 *av7110, int av)
if (av7110->playing & av)
return -EBUSY;
- av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, __Stop, 0);
+ av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, AV7110_REC_PLAY_STOP, 0);
if (av7110->playing == RP_NONE) {
av7110_ipack_reset(&av7110->ipack[0]);
@@ -168,15 +182,30 @@ int av7110_av_start_play(struct av7110 *av7110, int av)
av7110->playing |= av;
switch (av7110->playing) {
case RP_AUDIO:
- ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, __Play, 2, AudioPES, 0);
+ ret = av7110_fw_cmd(av7110,
+ COMTYPE_REC_PLAY,
+ AV7110_REC_PLAY_PLAY,
+ 2,
+ AudioPES,
+ 0);
break;
case RP_VIDEO:
- ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, __Play, 2, VideoPES, 0);
+ ret = av7110_fw_cmd(av7110,
+ COMTYPE_REC_PLAY,
+ AV7110_REC_PLAY_PLAY,
+ 2,
+ VideoPES,
+ 0);
av7110->sinfo = 0;
break;
case RP_AV:
av7110->sinfo = 0;
- ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, __Play, 2, AV_PES, 0);
+ ret = av7110_fw_cmd(av7110,
+ COMTYPE_REC_PLAY,
+ AV7110_REC_PLAY_PLAY,
+ 2,
+ AV_PES,
+ 0);
break;
}
return ret;
@@ -190,15 +219,25 @@ int av7110_av_stop(struct av7110 *av7110, int av)
if (!(av7110->playing & av) && !(av7110->rec_mode & av))
return 0;
- av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, __Stop, 0);
+ av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, AV7110_REC_PLAY_STOP, 0);
if (av7110->playing) {
av7110->playing &= ~av;
switch (av7110->playing) {
case RP_AUDIO:
- ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, __Play, 2, AudioPES, 0);
+ ret = av7110_fw_cmd(av7110,
+ COMTYPE_REC_PLAY,
+ AV7110_REC_PLAY_PLAY,
+ 2,
+ AudioPES,
+ 0);
break;
case RP_VIDEO:
- ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, __Play, 2, VideoPES, 0);
+ ret = av7110_fw_cmd(av7110,
+ COMTYPE_REC_PLAY,
+ AV7110_REC_PLAY_PLAY,
+ 2,
+ VideoPES,
+ 0);
break;
case RP_NONE:
ret = av7110_set_vidmode(av7110, av7110->vidmode);
@@ -208,10 +247,20 @@ int av7110_av_stop(struct av7110 *av7110, int av)
av7110->rec_mode &= ~av;
switch (av7110->rec_mode) {
case RP_AUDIO:
- 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,
+ AudioPES,
+ 0);
break;
case RP_VIDEO:
- ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, __Record, 2, VideoPES, 0);
+ ret = av7110_fw_cmd(av7110,
+ COMTYPE_REC_PLAY,
+ AV7110_REC_PLAY_RECORD,
+ 2,
+ VideoPES,
+ 0);
break;
case RP_NONE:
break;
@@ -551,7 +600,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)))
return count - todo;
}
n = todo;
@@ -1168,7 +1217,10 @@ static int dvb_video_ioctl(struct file *file,
}
if (av7110->videostate.stream_source == VIDEO_SOURCE_MEMORY) {
if (av7110->playing == RP_AV) {
- ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, __Stop, 0);
+ ret = av7110_fw_cmd(av7110,
+ COMTYPE_REC_PLAY,
+ AV7110_REC_PLAY_STOP,
+ 0);
if (ret)
break;
av7110->playing &= ~RP_VIDEO;
@@ -1184,7 +1236,10 @@ static int dvb_video_ioctl(struct file *file,
case VIDEO_FREEZE:
av7110->videostate.play_state = VIDEO_FREEZED;
if (av7110->playing & RP_VIDEO)
- ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, __Pause, 0);
+ ret = av7110_fw_cmd(av7110,
+ COMTYPE_REC_PLAY,
+ AV7110_REC_PLAY_PAUSE,
+ 0);
else
ret = vidcom(av7110, AV_VIDEO_CMD_FREEZE, 1);
if (!ret)
@@ -1193,7 +1248,10 @@ static int dvb_video_ioctl(struct file *file,
case VIDEO_CONTINUE:
if (av7110->playing & RP_VIDEO)
- ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, __Continue, 0);
+ ret = av7110_fw_cmd(av7110,
+ COMTYPE_REC_PLAY,
+ AV7110_REC_PLAY_CONTINUE,
+ 0);
if (!ret)
ret = vidcom(av7110, AV_VIDEO_CMD_PLAY, 0);
if (!ret) {
@@ -1291,7 +1349,7 @@ static int dvb_video_ioctl(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);
+ AV7110_REC_PLAY_SCAN_I, 2, AV_PES, 0);
else
ret = vidcom(av7110, AV_VIDEO_CMD_FFWD, arg);
if (!ret) {
@@ -1303,7 +1361,12 @@ static int dvb_video_ioctl(struct file *file,
case VIDEO_SLOWMOTION:
if (av7110->playing & RP_VIDEO) {
if (av7110->trickmode != TRICK_SLOW)
- ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, __Slow, 2, 0, 0);
+ ret = av7110_fw_cmd(av7110,
+ COMTYPE_REC_PLAY,
+ AV7110_REC_PLAY_SLOW,
+ 2,
+ 0,
+ 0);
if (!ret)
ret = vidcom(av7110, AV_VIDEO_CMD_SLOW, arg);
} else {
@@ -1329,15 +1392,15 @@ static int dvb_video_ioctl(struct file *file,
av7110_ipack_reset(&av7110->ipack[1]);
if (av7110->playing == RP_AV) {
ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY,
- __Play, 2, AV_PES, 0);
+ AV7110_REC_PLAY_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);
+ AV7110_REC_PLAY_SCAN_I, 2, AV_PES, 0);
if (av7110->trickmode == TRICK_SLOW) {
ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY,
- __Slow, 2, 0, 0);
+ AV7110_REC_PLAY_SLOW, 2, 0, 0);
if (!ret)
ret = vidcom(av7110, AV_VIDEO_CMD_SLOW, arg);
}
@@ -1483,7 +1546,7 @@ static int dvb_audio_ioctl(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);
+ AV7110_REC_PLAY_PLAY, 2, AV_PES, 0);
break;
case AUDIO_SET_ID:
diff --git a/drivers/staging/media/av7110/av7110_hw.h b/drivers/staging/media/av7110/av7110_hw.h
index d4579f411c56..1b17f1f2ea42 100644
--- a/drivers/staging/media/av7110/av7110_hw.h
+++ b/drivers/staging/media/av7110/av7110_hw.h
@@ -168,14 +168,14 @@ enum av7110_encoder_command {
};
enum av7110_rec_play_state {
- __Record,
- __Stop,
- __Play,
- __Pause,
- __Slow,
- __FF_IP,
- __Scan_I,
- __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
};
enum av7110_fw_cmd_misc {
--
2.25.1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-03-20 19:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-03-20 19:15 [PATCH v2] staging: media: av7110: fix coding style Chethan.C
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox