sh4: Trivial clean-ups for sh_timer.c
cover sh4: Trivial clean-ups for sh_timer.c
Fix coding style, add fallthrough anonotations and remove superfluous break statements in hw/timer/sh_timer.c.
Thomas Huth (3):
hw/timer/sh_timer: Coding style clean-up hw/timer/sh_timer: Silence warnings about missing fallthrough
statements
hw/timer/sh_timer: Remove superfluous "break" statements
hw/timer/sh_timer.c | 90 +++++++++++++++++++++++++++++---------------- 1 file changed, 58 insertions(+), 32 deletions(-)
Signature · 1 line
2.18.2
PATCH 1/3 hw/timer/sh_timer: Coding style clean-up
Replace TAB characters with spaces, put code after case-statement on separate lines and add some curly braces in related lines to keep checkpatch.pl happy.
--- hw/timer/sh_timer.c | 89 +++++++++++++++++++++++++++++---------------- 1 file changed, 57 insertions(+), 32 deletions(-)
hw/timer/sh_timer.c +57 -32
@@ -117,35 +117,55 @@ static void sh_timer_write(void *opaque, hwaddr offset,case 2 : freq >>=6 ;break ;case 3 : freq >>=8 ;break ;case 4 : freq >>=10 ;break ; -case 6 : -case 7 :if (s->feat &TIMER_FEAT_EXTCLK )break ; -default :hw_error ("sh_timer_write: Reserved TPSC value\n" );break ; +case 6 : +case 7 : +if (s->feat &TIMER_FEAT_EXTCLK ) { +break ; + } +default : +hw_error ("sh_timer_write: Reserved TPSC value\n" ); +break ; }switch ((value &TIMER_TCR_CKEG ) >>3 ) { -case 0 :break ; +case 0 : +break ;case 1 :case 2 : -case 3 :if (s->feat &TIMER_FEAT_EXTCLK )break ; -default :hw_error ("sh_timer_write: Reserved CKEG value\n" );break ; +case 3 : +if (s->feat &TIMER_FEAT_EXTCLK ) { +break ; + } +default : +hw_error ("sh_timer_write: Reserved CKEG value\n" ); +break ; }switch ((value &TIMER_TCR_ICPE ) >>6 ) { -case 0 :break ; +case 0 : +break ;case 2 : -case 3 :if (s->feat &TIMER_FEAT_CAPT )break ; -default :hw_error ("sh_timer_write: Reserved ICPE value\n" );break ; +case 3 : +if (s->feat &TIMER_FEAT_CAPT ) { +break ; + } +default : +hw_error ("sh_timer_write: Reserved ICPE value\n" ); +break ; } -if ((value &TIMER_TCR_UNF ) ==0 ) +if ((value &TIMER_TCR_UNF ) ==0 ) { s->int_level =0 ; + } - value &= ~TIMER_TCR_UNF ; + value &= ~TIMER_TCR_UNF ; -if ((value &TIMER_TCR_ICPF ) && (!(s->feat &TIMER_FEAT_CAPT ))) +if ((value &TIMER_TCR_ICPF ) && (!(s->feat &TIMER_FEAT_CAPT ))) {hw_error ("sh_timer_write: Reserved ICPF value\n" ); + } - value &= ~TIMER_TCR_ICPF ;/* capture not supported */ + value &= ~TIMER_TCR_ICPF ;/* capture not supported */ -if (value &TIMER_TCR_RESERVED ) +if (value &TIMER_TCR_RESERVED ) {hw_error ("sh_timer_write: Reserved TCR bits set\n" ); + } s->tcr = value;ptimer_set_limit (s->timer, s->tcor,0 );ptimer_set_freq (s->timer, freq);
@@ -158,8 +178,8 @@ static void sh_timer_write(void *opaque, hwaddr offset,case OFFSET_TCPR :if (s->feat &TIMER_FEAT_CAPT ) { s->tcpr = value; -break ; - } +break ; + }default :hw_error ("sh_timer_write: Bad offset %x\n" , (int )offset); }
@@ -241,8 +261,9 @@ static uint64_t tmu012_read(void *opaque, hwaddr offset,#endif if (offset >=0x20 ) { -if (!(s->feat &TMU012_FEAT_3CHAN )) -hw_error ("tmu012_write: Bad channel offset %x\n" , (int )offset); +if (!(s->feat &TMU012_FEAT_3CHAN )) { +hw_error ("tmu012_write: Bad channel offset %x\n" , (int )offset); + }return sh_timer_read (s->timer[2 ], offset -0x20 ); }
@@ -272,33 +293,36 @@ static void tmu012_write(void *opaque, hwaddr offset,#endif if (offset >=0x20 ) { -if (!(s->feat &TMU012_FEAT_3CHAN )) -hw_error ("tmu012_write: Bad channel offset %x\n" , (int )offset); +if (!(s->feat &TMU012_FEAT_3CHAN )) { +hw_error ("tmu012_write: Bad channel offset %x\n" , (int )offset); + }sh_timer_write (s->timer[2 ], offset -0x20 , value); -return ; +return ; }if (offset >=0x14 ) {sh_timer_write (s->timer[1 ], offset -0x14 , value); -return ; +return ; }if (offset >=0x08 ) {sh_timer_write (s->timer[0 ], offset -0x08 , value); -return ; +return ; }if (offset ==4 ) {sh_timer_start_stop (s->timer[0 ], value & (1 <<0 ));sh_timer_start_stop (s->timer[1 ], value & (1 <<1 )); -if (s->feat &TMU012_FEAT_3CHAN ) +if (s->feat &TMU012_FEAT_3CHAN ) {sh_timer_start_stop (s->timer[2 ], value & (1 <<2 )); -else -if (value & (1 <<2 )) + }else { +if (value & (1 <<2 )) {hw_error ("tmu012_write: Bad channel\n" ); + } + } - s->tstr = value; -return ; + s->tstr = value; +return ; }if ((s->feat &TMU012_FEAT_TOCR ) && offset ==0 ) {
@@ -314,8 +338,8 @@ static const MemoryRegionOps tmu012_ops = {void tmu012_init (MemoryRegion *sysmem,hwaddr base,int feat,uint32_t freq, -qemu_irq ch0_irq,qemu_irq ch1_irq, -qemu_irq ch2_irq0,qemu_irq ch2_irq1) +qemu_irq ch0_irq,qemu_irq ch1_irq, +qemu_irq ch2_irq0,qemu_irq ch2_irq1) {tmu012_state *s;int timer_feat = (feat &TMU012_FEAT_EXTCLK ) ?TIMER_FEAT_EXTCLK :0 ;
@@ -324,9 +348,10 @@ void tmu012_init(MemoryRegion *sysmem, hwaddr base, s->feat = feat; s->timer[0 ] =sh_timer_init (freq, timer_feat, ch0_irq); s->timer[1 ] =sh_timer_init (freq, timer_feat, ch1_irq); -if (feat &TMU012_FEAT_3CHAN ) +if (feat &TMU012_FEAT_3CHAN ) { s->timer[2 ] =sh_timer_init (freq, timer_feat |TIMER_FEAT_CAPT , - ch2_irq0);/* ch2_irq1 not supported */ + ch2_irq0);/* ch2_irq1 not supported */ + }memory_region_init_io (&s->iomem,NULL , &tmu012_ops, s,"timer" ,0x100000000ULL );
Signature · 1 line
2.18.2
PATCH 2/3 hw/timer/sh_timer: Silence warnings about missing fallthrough statements
In reply to Thomas HuthWhen compiling with -Werror=implicit-fallthrough, gcc complains about missing fallthrough annotations in this file. Looking at the code, the fallthrough is very likely intended here, so add some comments to silence the compiler warnings.
--- hw/timer/sh_timer.c | 4 ++++ 1 file changed, 4 insertions(+)
hw/timer/sh_timer.c +4 -0
@@ -122,6 +122,7 @@ static void sh_timer_write(void *opaque, hwaddr offset,if (s->feat &TIMER_FEAT_EXTCLK ) {break ; } +/* fallthrough */ default :hw_error ("sh_timer_write: Reserved TPSC value\n" );break ;
@@ -135,6 +136,7 @@ static void sh_timer_write(void *opaque, hwaddr offset,if (s->feat &TIMER_FEAT_EXTCLK ) {break ; } +/* fallthrough */ default :hw_error ("sh_timer_write: Reserved CKEG value\n" );break ;
@@ -147,6 +149,7 @@ static void sh_timer_write(void *opaque, hwaddr offset,if (s->feat &TIMER_FEAT_CAPT ) {break ; } +/* fallthrough */ default :hw_error ("sh_timer_write: Reserved ICPE value\n" );break ;
@@ -180,6 +183,7 @@ static void sh_timer_write(void *opaque, hwaddr offset, s->tcpr = value;break ; } +/* fallthrough */ default :hw_error ("sh_timer_write: Bad offset %x\n" , (int )offset); }
Signature · 1 line
2.18.2
PATCH 3/3 hw/timer/sh_timer: Remove superfluous "break" statements
In reply to Thomas Huthhw_error() is marked as QEMU_NORETURN, so the "break" statements after this function are just dead code.
--- hw/timer/sh_timer.c | 3 --- 1 file changed, 3 deletions(-)
hw/timer/sh_timer.c +0 -3
@@ -125,7 +125,6 @@ static void sh_timer_write(void *opaque, hwaddr offset,/* fallthrough */ default :hw_error ("sh_timer_write: Reserved TPSC value\n" ); -break ; }switch ((value &TIMER_TCR_CKEG ) >>3 ) {case 0 :
@@ -139,7 +138,6 @@ static void sh_timer_write(void *opaque, hwaddr offset,/* fallthrough */ default :hw_error ("sh_timer_write: Reserved CKEG value\n" ); -break ; }switch ((value &TIMER_TCR_ICPE ) >>6 ) {case 0 :
@@ -152,7 +150,6 @@ static void sh_timer_write(void *opaque, hwaddr offset,/* fallthrough */ default :hw_error ("sh_timer_write: Reserved ICPE value\n" ); -break ; }if ((value &TIMER_TCR_UNF ) ==0 ) { s->int_level =0 ;
Signature · 1 line
2.18.2
Quoted 5 lines · Thomas Huth
Thomas Huth (3):
hw/timer/sh_timer: Coding style clean-up hw/timer/sh_timer: Silence warnings about missing fallthrough
statements
hw/timer/sh_timer: Remove superfluous "break" statements
r~
Re: [PATCH 1/3] hw/timer/sh_timer: Coding style clean-up
In reply to Thomas HuthQuoted 8 lines · Thomas Huth
Replace TAB characters with spaces, put code after case-statement on separate lines and add some curly braces in related lines to keep checkpatch.pl happy.
Signed-off-by Thomas Huth <[email protected]>--- hw/timer/sh_timer.c | 89 +++++++++++++++++++++++++++++---------------- 1 file changed, 57 insertions(+), 32 deletions(-)
Easily reviewed with 'git-diff --color-words'.
Re: [PATCH 2/3] hw/timer/sh_timer: Silence warnings about missing fallthrough statements
In reply to Thomas HuthQuoted 5 lines · Thomas Huth
When compiling with -Werror=implicit-fallthrough, gcc complains about missing fallthrough annotations in this file. Looking at the code, the fallthrough is very likely intended here, so add some comments to silence the compiler warnings.
Quoted 4 lines
Signed-off-by Thomas Huth <[email protected]>--- hw/timer/sh_timer.c | 4 ++++ 1 file changed, 4 insertions(+)
Re: [PATCH 3/3] hw/timer/sh_timer: Remove superfluous "break" statements
In reply to Thomas HuthQuoted 7 lines · Thomas Huth
hw_error()is marked asQEMU_NORETURN, so the "break" statements after this function are just dead code.Signed-off-by Thomas Huth <[email protected]>--- hw/timer/sh_timer.c | 3 --- 1 file changed, 3 deletions(-)
Philippe Mathieu-Daudé
AppliedQuoted 12 lines · Thomas Huth
Fix coding style, add fallthrough anonotations and remove superfluous break statements in
hw/timer/sh_timer.c.Thomas Huth (3):
hw/timer/sh_timer: Coding style clean-up hw/timer/sh_timer: Silence warnings about missing fallthrough
statements
hw/timer/sh_timer: Remove superfluous "break" statementshw/timer/sh_timer.c | 90 +++++++++++++++++++++++++++++---------------- 1 file changed, 58 insertions(+), 32 deletions(-)
Thanks, applied to renesas-next.