mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
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: Pierre Morel <pmorel@linux.vnet.ibm.com> Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com> Acked-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
parent
8f0ba83178
commit
e510f681d2
1 changed files with 4 additions and 23 deletions
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue