lkml.org 
[lkml]   [2016]   [Nov]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/14] pinctrl-sx150x: Move some code out of sx150x_init_hw
    Date
    Move the code configuring explicit IRQ acking into a standalone function
    to declutter sx150x_init_hw a bit and make that code somewhat less
    repetitious.

    Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
    ---
    drivers/pinctrl/pinctrl-sx150x.c | 38 ++++++++++++++++++++++++++------------
    1 file changed, 26 insertions(+), 12 deletions(-)

    diff --git a/drivers/pinctrl/pinctrl-sx150x.c b/drivers/pinctrl/pinctrl-sx150x.c
    index a38c8fc..4283504 100644
    --- a/drivers/pinctrl/pinctrl-sx150x.c
    +++ b/drivers/pinctrl/pinctrl-sx150x.c
    @@ -914,6 +914,31 @@ static int sx150x_reset(struct sx150x_pinctrl *pctl)
    return err;
    }

    +static int sx150x_init_misc(struct sx150x_pinctrl *pctl)
    +{
    + u8 reg, value;
    +
    + switch (pctl->data->model) {
    + case SX150X_789:
    + reg = pctl->data->pri.x789.reg_misc;
    + value = SX150X_789_REG_MISC_AUTOCLEAR_OFF;
    + break;
    + case SX150X_456:
    + reg = pctl->data->pri.x456.reg_advance;
    + value = 0x00;
    + break;
    + case SX150X_123:
    + reg = pctl->data->pri.x123.reg_advance;
    + value = 0x00;
    + break;
    + default:
    + WARN(1, "Unknown chip model %d\n", pctl->data->model);
    + return -EINVAL;
    + }
    +
    + return sx150x_i2c_write(pctl->client, reg, value);
    +}
    +
    static int sx150x_init_hw(struct sx150x_pinctrl *pctl)
    {
    int err;
    @@ -925,18 +950,7 @@ static int sx150x_init_hw(struct sx150x_pinctrl *pctl)
    return err;
    }

    - if (pctl->data->model == SX150X_789)
    - err = sx150x_i2c_write(pctl->client,
    - pctl->data->pri.x789.reg_misc,
    - SX150X_789_REG_MISC_AUTOCLEAR_OFF);
    - else if (pctl->data->model == SX150X_456)
    - err = sx150x_i2c_write(pctl->client,
    - pctl->data->pri.x456.reg_advance,
    - 0x00);
    - else
    - err = sx150x_i2c_write(pctl->client,
    - pctl->data->pri.x123.reg_advance,
    - 0x00);
    + err = sx150x_init_misc(pctl);
    if (err < 0)
    return err;

    --
    2.5.5
    \
     
     \ /
      Last update: 2016-11-01 16:59    [W:3.003 / U:0.236 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site