Re: [PATCH 1/1] pseries/hotplug-memory.c: Replace nested ifs by switch-case

[Leonardo Bras <leonardo@linux.ibm.com>]

[-- Attachment #1: Type: text/plain, Size: 2960 bytes --]

On Fri, 2019-08-02 at 22:26 +1000, Michael Ellerman wrote:
> Leonardo Bras <leonardo@linux.ibm.com> writes:
> > I noticed these nested ifs can be easily replaced by switch-cases,
> > which can improve readability.
> > 
> > Signed-off-by: Leonardo Bras <leonardo@linux.ibm.com>
> > ---
> >  .../platforms/pseries/hotplug-memory.c        | 26 +++++++++++++------
> >  1 file changed, 18 insertions(+), 8 deletions(-)
> 
> Thanks, this looks sensible.
> 
> Please use "powerpc/" as the prefix on your patches, eg. in this case:
> 
> "powerpc/pseries/hotplug-memory.c: Replace nested ifs by switch-case"
> 
Ok, I will make sure to do that next time.
Thanks!

> I'll fix it up this time when I apply.
> 
> cheers
> 
> > diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c
> > index 46d0d35b9ca4..8e700390f3d6 100644
> > --- a/arch/powerpc/platforms/pseries/hotplug-memory.c
> > +++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
> > @@ -880,34 +880,44 @@ int dlpar_memory(struct pseries_hp_errorlog *hp_elog)
> >  
> >  	switch (hp_elog->action) {
> >  	case PSERIES_HP_ELOG_ACTION_ADD:
> > -		if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_COUNT) {
> > +		switch (hp_elog->id_type) {
> > +		case PSERIES_HP_ELOG_ID_DRC_COUNT:
> >  			count = hp_elog->_drc_u.drc_count;
> >  			rc = dlpar_memory_add_by_count(count);
> > -		} else if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_INDEX) {
> > +			break;
> > +		case PSERIES_HP_ELOG_ID_DRC_INDEX:
> >  			drc_index = hp_elog->_drc_u.drc_index;
> >  			rc = dlpar_memory_add_by_index(drc_index);
> > -		} else if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_IC) {
> > +			break;
> > +		case PSERIES_HP_ELOG_ID_DRC_IC:
> >  			count = hp_elog->_drc_u.ic.count;
> >  			drc_index = hp_elog->_drc_u.ic.index;
> >  			rc = dlpar_memory_add_by_ic(count, drc_index);
> > -		} else {
> > +			break;
> > +		default:
> >  			rc = -EINVAL;
> > +			break;
> >  		}
> >  
> >  		break;
> >  	case PSERIES_HP_ELOG_ACTION_REMOVE:
> > -		if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_COUNT) {
> > +		switch (hp_elog->id_type) {
> > +		case PSERIES_HP_ELOG_ID_DRC_COUNT:
> >  			count = hp_elog->_drc_u.drc_count;
> >  			rc = dlpar_memory_remove_by_count(count);
> > -		} else if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_INDEX) {
> > +			break;
> > +		case PSERIES_HP_ELOG_ID_DRC_INDEX:
> >  			drc_index = hp_elog->_drc_u.drc_index;
> >  			rc = dlpar_memory_remove_by_index(drc_index);
> > -		} else if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_IC) {
> > +			break;
> > +		case PSERIES_HP_ELOG_ID_DRC_IC:
> >  			count = hp_elog->_drc_u.ic.count;
> >  			drc_index = hp_elog->_drc_u.ic.index;
> >  			rc = dlpar_memory_remove_by_ic(count, drc_index);
> > -		} else {
> > +			break;
> > +		default:
> >  			rc = -EINVAL;
> > +			break;
> >  		}
> >  
> >  		break;
> > -- 
> > 2.20.1

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]