lkml.org 
[lkml]   [2016]   [Jun]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next v2 2/6] r8152: add u1u2_enable for rtl_ops
    Date
    Add u1u2_enable() for rtl_ops.

    Signed-off-by: Hayes Wang <hayeswang@realtek.com>
    ---
    drivers/net/usb/r8152.c | 13 ++++++++-----
    1 file changed, 8 insertions(+), 5 deletions(-)

    diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
    index b253003..f51d799 100644
    --- a/drivers/net/usb/r8152.c
    +++ b/drivers/net/usb/r8152.c
    @@ -620,6 +620,7 @@ struct r8152 {
    int (*eee_set)(struct r8152 *, struct ethtool_eee *);
    bool (*in_nway)(struct r8152 *);
    void (*aldps_enable)(struct r8152 *tp, bool enable);
    + void (*u1u2_enable)(struct r8152 *tp, bool enable);
    void (*hw_phy_cfg)(struct r8152 *);
    } rtl_ops;

    @@ -2408,7 +2409,7 @@ static void rtl_runtime_suspend_enable(struct r8152 *tp, bool enable)
    if (enable) {
    u32 ocp_data;

    - r8153_u1u2en(tp, false);
    + tp->rtl_ops.u1u2_enable(tp, false);
    r8153_u2p3en(tp, false);

    __rtl_set_wol(tp, WAKE_ANY);
    @@ -2423,7 +2424,7 @@ static void rtl_runtime_suspend_enable(struct r8152 *tp, bool enable)
    } else {
    __rtl_set_wol(tp, tp->saved_wolopts);
    r8153_u2p3en(tp, true);
    - r8153_u1u2en(tp, true);
    + tp->rtl_ops.u1u2_enable(tp, true);
    }
    }

    @@ -2922,12 +2923,12 @@ static void rtl8153_up(struct r8152 *tp)
    if (test_bit(RTL8152_UNPLUG, &tp->flags))
    return;

    - r8153_u1u2en(tp, false);
    + tp->rtl_ops.u1u2_enable(tp, false);
    tp->rtl_ops.aldps_enable(tp, false);
    r8153_first_init(tp);
    tp->rtl_ops.aldps_enable(tp, true);
    r8153_u2p3en(tp, true);
    - r8153_u1u2en(tp, true);
    + tp->rtl_ops.u1u2_enable(tp, true);
    usb_enable_lpm(tp->udev);
    }

    @@ -2938,7 +2939,7 @@ static void rtl8153_down(struct r8152 *tp)
    return;
    }

    - r8153_u1u2en(tp, false);
    + tp->rtl_ops.u1u2_enable(tp, false);
    r8153_u2p3en(tp, false);
    r8153_power_cut_en(tp, false);
    tp->rtl_ops.aldps_enable(tp, false);
    @@ -4142,6 +4143,7 @@ static int rtl_ops_init(struct r8152 *tp)
    ops->eee_set = r8152_set_eee;
    ops->in_nway = rtl8152_in_nway;
    ops->aldps_enable = r8152_aldps_en;
    + ops->u1u2_enable = r8153_u1u2en;
    ops->hw_phy_cfg = r8152b_hw_phy_cfg;
    break;

    @@ -4159,6 +4161,7 @@ static int rtl_ops_init(struct r8152 *tp)
    ops->eee_set = r8153_set_eee;
    ops->in_nway = rtl8153_in_nway;
    ops->aldps_enable = r8153_aldps_en;
    + ops->u1u2_enable = r8153_u1u2en;
    ops->hw_phy_cfg = r8153_hw_phy_cfg;
    break;

    --
    2.4.11
    \
     
     \ /
      Last update: 2016-06-28 05:41    [W:4.935 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site