@@ -228,10 +228,6 @@ static void fsm_disabled_irq(struct vfio_ccw_private *private,
*/
cio_disable_subchannel(sch);
}
-inline struct subchannel_id get_schid(struct vfio_ccw_private *p)
-{
- return p->sch->schid;
-}
/*
* Deal with the ccw command request from the userspace.
@@ -244,7 +240,7 @@ static void fsm_io_request(struct vfio_ccw_private *private,
struct ccw_io_region *io_region = private->io_region;
struct mdev_device *mdev = private->mdev;
char *errstr = "request";
- struct subchannel_id schid = get_schid(private);
+ struct subchannel_id schid = private->sch->schid;
private->state = VFIO_CCW_STATE_CP_PROCESSING;
memcpy(scsw, io_region->scsw_area, sizeof(*scsw));
@@ -342,7 +338,7 @@ static void fsm_async_request(struct vfio_ccw_private *private,
cmd_region->ret_code = -EINVAL;
}
- trace_vfio_ccw_fsm_async_request(get_schid(private),
+ trace_vfio_ccw_fsm_async_request(private->sch->schid,
cmd_region->command,
cmd_region->ret_code);
}
This seems misplaced in the middle of FSM, returning the schid field from inside the private struct. We could move this macro into vfio_ccw_private.h, but this doesn't seem to simplify things that much. Let's just remove it, and use the field directly. Signed-off-by: Eric Farman <farman@linux.ibm.com> --- drivers/s390/cio/vfio_ccw_fsm.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)