lkml.org 
[lkml]   [2018]   [May]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 09/10] vfio: ccw: Suppressing the BOXED state
    Date
    VFIO_CCW_STATE_BOXED and VFIO_CCW_STATE_BUSY are the same
    states.
    Let's only keep one: VFIO_CCW_STATE_BUSY

    Signed-off-by: Pierre Morel <pmorel@linux.vnet.ibm.com>
    ---
    drivers/s390/cio/vfio_ccw_fsm.c | 11 -----------
    drivers/s390/cio/vfio_ccw_private.h | 1 -
    2 files changed, 12 deletions(-)

    diff --git a/drivers/s390/cio/vfio_ccw_fsm.c b/drivers/s390/cio/vfio_ccw_fsm.c
    index 0acab2f..c37052d 100644
    --- a/drivers/s390/cio/vfio_ccw_fsm.c
    +++ b/drivers/s390/cio/vfio_ccw_fsm.c
    @@ -162,8 +162,6 @@ static int fsm_io_request(struct vfio_ccw_private *private)
    struct ccw_io_region *io_region = &private->io_region;
    struct mdev_device *mdev = private->mdev;

    - private->state = VFIO_CCW_STATE_BOXED;
    -
    orb = (union orb *)io_region->orb_area;

    io_region->ret_code = cp_init(&private->cp, mdev_dev(mdev), orb);
    @@ -263,15 +261,6 @@ fsm_func_t *vfio_ccw_jumptable[NR_VFIO_CCW_STATES][NR_VFIO_CCW_EVENTS] = {
    [VFIO_CCW_EVENT_INTERRUPT] = fsm_irq,
    [VFIO_CCW_EVENT_SCHIB_CHANGED] = fsm_sch_event,
    },
    - [VFIO_CCW_STATE_BOXED] = {
    - [VFIO_CCW_EVENT_INIT] = fsm_nop,
    - [VFIO_CCW_EVENT_ONLINE] = fsm_nop,
    - [VFIO_CCW_EVENT_OFFLINE] = fsm_quiescing,
    - [VFIO_CCW_EVENT_NOT_OPER] = fsm_notoper,
    - [VFIO_CCW_EVENT_SSCH_REQ] = fsm_io_busy,
    - [VFIO_CCW_EVENT_INTERRUPT] = fsm_irq,
    - [VFIO_CCW_EVENT_SCHIB_CHANGED] = fsm_sch_event,
    - },
    [VFIO_CCW_STATE_BUSY] = {
    [VFIO_CCW_EVENT_INIT] = fsm_nop,
    [VFIO_CCW_EVENT_ONLINE] = fsm_nop,
    diff --git a/drivers/s390/cio/vfio_ccw_private.h b/drivers/s390/cio/vfio_ccw_private.h
    index ad59091..ab5e37fa 100644
    --- a/drivers/s390/cio/vfio_ccw_private.h
    +++ b/drivers/s390/cio/vfio_ccw_private.h
    @@ -66,7 +66,6 @@ enum vfio_ccw_state {
    VFIO_CCW_STATE_NOT_OPER,
    VFIO_CCW_STATE_STANDBY,
    VFIO_CCW_STATE_IDLE,
    - VFIO_CCW_STATE_BOXED,
    VFIO_CCW_STATE_BUSY,
    VFIO_CCW_STATE_QUIESCING,
    /* last element! */
    --
    2.7.4
    \
     
     \ /
      Last update: 2018-05-25 12:23    [W:2.775 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site