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 05/10] vfio: ccw: Suppress unused event parameter
    Date
    The fsm_func_t function type definition does not need the event
    parameter since all functions are in a state/event table.

    Signed-off-by: Pierre Morel <pmorel@linux.vnet.ibm.com>
    ---
    drivers/s390/cio/vfio_ccw_fsm.c | 24 ++++++++----------------
    drivers/s390/cio/vfio_ccw_private.h | 5 ++---
    2 files changed, 10 insertions(+), 19 deletions(-)

    diff --git a/drivers/s390/cio/vfio_ccw_fsm.c b/drivers/s390/cio/vfio_ccw_fsm.c
    index 86dab8c..077da23 100644
    --- a/drivers/s390/cio/vfio_ccw_fsm.c
    +++ b/drivers/s390/cio/vfio_ccw_fsm.c
    @@ -60,8 +60,7 @@ static int fsm_io_helper(struct vfio_ccw_private *private)
    return ret;
    }

    -static int fsm_notoper(struct vfio_ccw_private *private,
    - enum vfio_ccw_event event)
    +static int fsm_notoper(struct vfio_ccw_private *private)
    {
    struct subchannel *sch = private->sch;

    @@ -76,29 +75,25 @@ static int fsm_notoper(struct vfio_ccw_private *private,
    /*
    * No operation action.
    */
    -static int fsm_nop(struct vfio_ccw_private *private,
    - enum vfio_ccw_event event)
    +static int fsm_nop(struct vfio_ccw_private *private)
    {
    return private->state;
    }

    -static int fsm_io_error(struct vfio_ccw_private *private,
    - enum vfio_ccw_event event)
    +static int fsm_io_error(struct vfio_ccw_private *private)
    {
    pr_err("vfio-ccw: FSM: I/O request from state:%d\n", private->state);
    private->io_region.ret_code = -EIO;
    return private->state;
    }

    -static int fsm_io_busy(struct vfio_ccw_private *private,
    - enum vfio_ccw_event event)
    +static int fsm_io_busy(struct vfio_ccw_private *private)
    {
    private->io_region.ret_code = -EBUSY;
    return private->state;
    }

    -static int fsm_disabled_irq(struct vfio_ccw_private *private,
    - enum vfio_ccw_event event)
    +static int fsm_disabled_irq(struct vfio_ccw_private *private)
    {
    struct subchannel *sch = private->sch;

    @@ -113,8 +108,7 @@ static int fsm_disabled_irq(struct vfio_ccw_private *private,
    /*
    * Deal with the ccw command request from the userspace.
    */
    -static int fsm_io_request(struct vfio_ccw_private *private,
    - enum vfio_ccw_event event)
    +static int fsm_io_request(struct vfio_ccw_private *private)
    {
    union orb *orb;
    struct ccw_io_region *io_region = &private->io_region;
    @@ -148,8 +142,7 @@ static int fsm_io_request(struct vfio_ccw_private *private,
    /*
    * Got an interrupt for a normal io (state busy).
    */
    -static int fsm_irq(struct vfio_ccw_private *private,
    - enum vfio_ccw_event event)
    +static int fsm_irq(struct vfio_ccw_private *private)
    {
    struct irb *irb = &private->irb;

    @@ -167,8 +160,7 @@ static int fsm_irq(struct vfio_ccw_private *private,
    /*
    * Got a sub-channel event .
    */
    -static int fsm_sch_event(struct vfio_ccw_private *private,
    - enum vfio_ccw_event event)
    +static int fsm_sch_event(struct vfio_ccw_private *private)
    {
    unsigned long flags;
    int ret = private->state;
    diff --git a/drivers/s390/cio/vfio_ccw_private.h b/drivers/s390/cio/vfio_ccw_private.h
    index 94fb408..6c74f73 100644
    --- a/drivers/s390/cio/vfio_ccw_private.h
    +++ b/drivers/s390/cio/vfio_ccw_private.h
    @@ -86,14 +86,13 @@ enum vfio_ccw_event {
    /*
    * Action called through jumptable.
    */
    -typedef int (fsm_func_t)(struct vfio_ccw_private *, enum vfio_ccw_event);
    +typedef int (fsm_func_t)(struct vfio_ccw_private *);
    extern fsm_func_t *vfio_ccw_jumptable[NR_VFIO_CCW_STATES][NR_VFIO_CCW_EVENTS];

    static inline void vfio_ccw_fsm_event(struct vfio_ccw_private *private,
    int event)
    {
    - private->state = vfio_ccw_jumptable[private->state][event](private,
    - event);
    + private->state = vfio_ccw_jumptable[private->state][event](private);
    }

    extern struct workqueue_struct *vfio_ccw_work_q;
    --
    2.7.4
    \
     
     \ /
      Last update: 2018-05-25 12:23    [W:3.246 / U:1.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site