lkml.org 
[lkml]   [2012]   [Apr]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH net-next] vxge: Convert macro to inline function
    From
    Date
    Convert the macro to inline function to check the arguments.

    Signed-off-by: Joe Perches <joe@perches.com>
    ---
    > Longer term I'd much rather see this turned into an inline
    > function with proper type checking etc.

    Something like this?

    drivers/net/ethernet/neterion/vxge/vxge-main.c | 6 +++---
    drivers/net/ethernet/neterion/vxge/vxge-main.h | 15 +++++++++------
    2 files changed, 12 insertions(+), 9 deletions(-)

    diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c
    index ef76725..95fb611 100644
    --- a/drivers/net/ethernet/neterion/vxge/vxge-main.c
    +++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c
    @@ -2860,12 +2860,12 @@ static int vxge_open(struct net_device *dev)
    vdev->config.rx_pause_enable);

    if (vdev->vp_reset_timer.function == NULL)
    - vxge_os_timer(vdev->vp_reset_timer,
    - vxge_poll_vp_reset, vdev, (HZ/2));
    + vxge_os_timer(&vdev->vp_reset_timer, vxge_poll_vp_reset, vdev,
    + HZ / 2);

    /* There is no need to check for RxD leak and RxD lookup on Titan1A */
    if (vdev->titan1 && vdev->vp_lockup_timer.function == NULL)
    - vxge_os_timer(vdev->vp_lockup_timer, vxge_poll_vp_lockup, vdev,
    + vxge_os_timer(&vdev->vp_lockup_timer, vxge_poll_vp_lockup, vdev,
    HZ / 2);

    set_bit(__VXGE_STATE_CARD_UP, &vdev->state);
    diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.h b/drivers/net/ethernet/neterion/vxge/vxge-main.h
    index f52a42d..35f3e75 100644
    --- a/drivers/net/ethernet/neterion/vxge/vxge-main.h
    +++ b/drivers/net/ethernet/neterion/vxge/vxge-main.h
    @@ -416,12 +416,15 @@ struct vxge_tx_priv {
    static int p = val; \
    module_param(p, int, 0)

    -#define vxge_os_timer(timer, handle, arg, exp) do { \
    - init_timer(&timer); \
    - timer.function = handle; \
    - timer.data = (unsigned long) arg; \
    - mod_timer(&timer, (jiffies + exp)); \
    - } while (0)
    +static inline
    +void vxge_os_timer(struct timer_list *timer, void (*func)(unsigned long data),
    + struct vxgedev *vdev, unsigned long timeout)
    +{
    + init_timer(timer);
    + timer->function = func;
    + timer->data = (unsigned long)vdev;
    + mod_timer(timer, jiffies + timeout);
    +}

    void vxge_initialize_ethtool_ops(struct net_device *ndev);
    enum vxge_hw_status vxge_reset_all_vpaths(struct vxgedev *vdev);



    \
     
     \ /
      Last update: 2012-04-04 00:17    [W:0.039 / U:0.044 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site