lkml.org 
[lkml]   [2014]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 08/21] pinctrl: mvebu: remove checks for mpp_get/set
    Date
    Now, that name generation has been moved, we can identify generic mpp
    ranges by NULL name. To allow further redesign, remove checks for SoC
    specific callbacks mpp_get/set and use NULL name instead.

    Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
    ---
    Cc: Jason Cooper <jason@lakedaemon.net>
    Cc: Andrew Lunn <andrew@lunn.ch>
    Cc: Gregory Clement <gregory.clement@free-electrons.com>
    Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
    Cc: Linus Walleij <linus.walleij@linaro.org>
    Cc: linux-arm-kernel@lists.infradead.org
    Cc: linux-kernel@vger.kernel.org
    ---
    drivers/pinctrl/mvebu/pinctrl-mvebu.c | 15 ++++-----------
    1 file changed, 4 insertions(+), 11 deletions(-)

    diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.c b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
    index 375666b0abc3..2bec4ef30b48 100644
    --- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c
    +++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
    @@ -637,18 +637,11 @@ int mvebu_pinctrl_probe(struct platform_device *pdev, void __iomem *base)
    for (k = 0; k < ctrl->npins; k++)
    ctrl->pins[k] = ctrl->pid + k;

    - /* special soc specific control */
    - if (ctrl->mpp_get || ctrl->mpp_set) {
    - if (!ctrl->name || !ctrl->mpp_get || !ctrl->mpp_set) {
    - dev_err(&pdev->dev, "wrong soc control info\n");
    - return -EINVAL;
    - }
    + /* generic mvebu register groups have no name passed */
    + if (!ctrl->name)
    + pctl->num_groups += ctrl->npins;
    + else
    pctl->num_groups += 1;
    - continue;
    - }
    -
    - /* generic mvebu register control */
    - pctl->num_groups += ctrl->npins;
    }

    pdesc = devm_kzalloc(&pdev->dev, pctl->desc.npins *
    --
    1.8.5.2


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