lkml.org 
[lkml]   [2014]   [Mar]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 129/149] can: flexcan: factor out transceiver {en,dis}able into seperate functions
    Date
    3.13-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Marc Kleine-Budde <mkl@pengutronix.de>

    commit f003698e23f6f56a791774f14d0ac35d04872490 upstream.

    This patch moves the transceiver enable and disable into seperate functions,
    where the NULL pointer check is hidden.

    Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/net/can/flexcan.c | 27 ++++++++++++++++++++-------
    1 file changed, 20 insertions(+), 7 deletions(-)

    --- a/drivers/net/can/flexcan.c
    +++ b/drivers/net/can/flexcan.c
    @@ -261,6 +261,22 @@ static inline void flexcan_write(u32 val
    }
    #endif

    +static inline int flexcan_transceiver_enable(const struct flexcan_priv *priv)
    +{
    + if (!priv->reg_xceiver)
    + return 0;
    +
    + return regulator_enable(priv->reg_xceiver);
    +}
    +
    +static inline int flexcan_transceiver_disable(const struct flexcan_priv *priv)
    +{
    + if (!priv->reg_xceiver)
    + return 0;
    +
    + return regulator_disable(priv->reg_xceiver);
    +}
    +
    static inline int flexcan_has_and_handle_berr(const struct flexcan_priv *priv,
    u32 reg_esr)
    {
    @@ -805,11 +821,9 @@ static int flexcan_chip_start(struct net
    if (priv->devtype_data->features & FLEXCAN_HAS_V10_FEATURES)
    flexcan_write(0x0, &regs->rxfgmask);

    - if (priv->reg_xceiver) {
    - err = regulator_enable(priv->reg_xceiver);
    - if (err)
    - goto out;
    - }
    + err = flexcan_transceiver_enable(priv);
    + if (err)
    + goto out;

    /* synchronize with the can bus */
    reg_mcr = flexcan_read(&regs->mcr);
    @@ -854,8 +868,7 @@ static void flexcan_chip_stop(struct net
    flexcan_write(priv->reg_ctrl_default & ~FLEXCAN_CTRL_ERR_ALL,
    &regs->ctrl);

    - if (priv->reg_xceiver)
    - regulator_disable(priv->reg_xceiver);
    + flexcan_transceiver_disable(priv);
    priv->can.state = CAN_STATE_STOPPED;

    return;



    \
     
     \ /
      Last update: 2014-03-21 02:02    [W:4.194 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site