Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e510f681 authored by Pierre Morel's avatar Pierre Morel Committed by Martin Schwidefsky
Browse files

s390/cio: de-duplicate subchannel validation 



cio_validate_io_subchannel() and cio_validate_msg_subchannel() are
identical, as the called functions already take care about the
differences between subchannel types.

Just inline the code into the only user,
cio_validate_subchannel(), instead.

Signed-off-by: default avatarPierre Morel <pmorel@linux.vnet.ibm.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 8f0ba831

drivers/s390/cio/cio.c

+4 −23
Original line number Diff line number Diff line
@@ -476,26 +476,6 @@ static int cio_check_devno_blacklisted(struct subchannel *sch) 
	return 0;

}



static int cio_validate_io_subchannel(struct subchannel *sch)

{

	/* Initialization for io subchannels. */

	if (!css_sch_is_valid(&sch->schib))

		return -ENODEV;



	/* Devno is valid. */

	return cio_check_devno_blacklisted(sch);

}



static int cio_validate_msg_subchannel(struct subchannel *sch)

{

	/* Initialization for message subchannels. */

	if (!css_sch_is_valid(&sch->schib))

		return -ENODEV;



	/* Devno is valid. */

	return cio_check_devno_blacklisted(sch);

}



/**

 * cio_validate_subchannel - basic validation of subchannel

 * @sch: subchannel structure to be filled out
@@ -533,10 +513,11 @@ int cio_validate_subchannel(struct subchannel *sch, struct subchannel_id schid) 


	switch (sch->st) {

	case SUBCHANNEL_TYPE_IO:

		err = cio_validate_io_subchannel(sch);

		break;

	case SUBCHANNEL_TYPE_MSG:

		err = cio_validate_msg_subchannel(sch);

		if (!css_sch_is_valid(&sch->schib))

			err = -ENODEV;

		else

			err = cio_check_devno_blacklisted(sch);

		break;

	default:

		err = 0;