staging: media: av7110: coding style fixes: too many tabs
Subsystems (2)
PATCH v3 1/1 staging: media: av7110: coding style fixes: too many tabs
This patch fixes below warning reported by checkpatch.pl
WARNING: Too many leading tabs - consider code refactoring
---
PATCH v3 consolidates and addresses review comments from earlier versions.
v3:
- Removed the additional tabs in handle_ts_memory_fe() as indicated by Greg KH
- Retained the original code style as suggested by Dan Carpenter
v2:
- Refactored change by adding function handle_ts_memory_fe
v2: https://lore.kernel.org/linux-staging/[email protected]/
v1: https://lore.kernel.org/linux-staging/[email protected]/
drivers/staging/media/av7110/av7110.c | 33 +++++++++++++++++++-------- 1 file changed, 23 insertions(+), 10 deletions(-)
drivers/staging/media/av7110/av7110.c +23 -10
@@ -932,6 +932,28 @@ static int dvb_feed_stop_pid(struct dvb_demux_feed *dvbdmxfeed)return ret; } +static int handle_ts_memory_fe (struct dvb_demux_feed *feed, +struct dvb_demux *demux, +struct av7110 *av7110) +{ +int ret =0 ; + +if (feed->pes_type >=2 ) +return 0 ; + +if ((demux->pids[0 ] &0x8000 ) || (demux->pids[1 ] &0x8000 )) +return 0 ; + +dvb_ringbuffer_flush_spinlock_wakeup (&av7110->avout); +dvb_ringbuffer_flush_spinlock_wakeup (&av7110->aout); + + ret =av7110_av_start_play (av7110,RP_AV ); +if (!ret) + demux->playing = true; + +return ret; +} +static int av7110_start_feed (struct dvb_demux_feed *feed) {struct dvb_demux *demux = feed->demux;
@@ -951,16 +973,7 @@ static int av7110_start_feed(struct dvb_demux_feed *feed) (feed->pes_type <= DMX_PES_PCR)) {switch (demux->dmx.frontend->source) {case DMX_MEMORY_FE : -if (feed->ts_type &TS_DECODER ) -if (feed->pes_type <2 && - !(demux->pids[0 ] &0x8000 ) && - !(demux->pids[1 ] &0x8000 )) { -dvb_ringbuffer_flush_spinlock_wakeup (&av7110->avout); -dvb_ringbuffer_flush_spinlock_wakeup (&av7110->aout); - ret =av7110_av_start_play (av7110,RP_AV ); -if (!ret) - demux->playing =1 ; - } + ret =handle_ts_memory_fe (feed, demux, av7110);break ;default : ret =dvb_feed_start_pid (feed);
--
2.43.0
Quoted 25 lines · Sudarshan Srinivasan
This patch fixes below warning reported by checkpatch.pl
WARNING: Too many leading tabs - consider code refactoringSigned-off-by Sudarshan Srinivasan <[email protected]>---
PATCH v3 consolidates and addresses review comments from earlier versions.v3:
- Removed the additional tabs inhandle_ts_memory_fe()as indicated by Greg KH
- Retained the original code style as suggested by Dan Carpenter
v2:
- Refactored change by adding functionhandle_ts_memory_fev2: https://lore.kernel.org/linux-staging/[email protected]/
v1: https://lore.kernel.org/linux-staging/[email protected]/drivers/staging/media/av7110/av7110.c | 33 +++++++++++++++++++-------- 1 file changed, 23 insertions(+), 10 deletions(-)drivers/staging/media/av7110/av7110.c +0
-0
drivers/staging/media/av7110/av7110.c static int dvb_feed_stop_pid(struct dvb_demux_feed *dvbdmxfeed) · line 939
Quoted 8 lines
drivers/staging/media/av7110/av7110.c +5
-0@@ -932,6 +932,28 @@ static int dvb_feed_stop_pid(struct dvb_demux_feed *dvbdmxfeed)return ret; } +static int handle_ts_memory_fe (struct dvb_demux_feed *feed, +struct dvb_demux *demux, +struct av7110 *av7110) +{ +int ret =0 ;
Don't do this unnnecessary initialization. It just disables static analysis for no reason.
drivers/staging/media/av7110/av7110.c static int dvb_feed_stop_pid(struct dvb_demux_feed *dvbdmxfeed) · line 940
Quoted 1 line
drivers/staging/media/av7110/av7110.c +1
-0+
What happened to the if (feed->ts_type & TS_DECODER) check?
regards,
dan carpenter
Quoted 40 lines
drivers/staging/media/av7110/av7110.c +17
-11+if (feed->pes_type >=2 ) +return 0 ; + +if ((demux->pids[0 ] &0x8000 ) || (demux->pids[1 ] &0x8000 )) +return 0 ; + +dvb_ringbuffer_flush_spinlock_wakeup (&av7110->avout); +dvb_ringbuffer_flush_spinlock_wakeup (&av7110->aout); + + ret =av7110_av_start_play (av7110,RP_AV ); +if (!ret) + demux->playing = true; + +return ret; +} +static int av7110_start_feed (struct dvb_demux_feed *feed) {struct dvb_demux *demux = feed->demux;@@ -951,16 +973,7 @@ static int av7110_start_feed(struct dvb_demux_feed *feed) (feed->pes_type <= DMX_PES_PCR)) {switch (demux->dmx.frontend->source) {case DMX_MEMORY_FE : -if (feed->ts_type &TS_DECODER ) -if (feed->pes_type <2 && - !(demux->pids[0 ] &0x8000 ) && - !(demux->pids[1 ] &0x8000 )) { -dvb_ringbuffer_flush_spinlock_wakeup (&av7110->avout); -dvb_ringbuffer_flush_spinlock_wakeup (&av7110->aout); - ret =av7110_av_start_play (av7110,RP_AV ); -if (!ret) - demux->playing =1 ; - } + ret =handle_ts_memory_fe (feed, demux, av7110);break ;default : ret =dvb_feed_start_pid (feed); --2.43.0