lkml.org 
[lkml]   [2019]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 111/239] pinctrl: at91-pio4: fix has_config check in atmel_pctl_dt_subnode_to_map()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit b97760ae8e3dc8bb91881c13425a0bff55f2bd85 ]

    Smatch complains about this condition:

    if (has_config && num_pins >= 1)

    The "has_config" variable is either uninitialized or true. The
    "num_pins" variable is unsigned and we verified that it is non-zero on
    the lines before so we know "num_pines >= 1" is true. Really, we could
    just check "num_configs" directly and remove the "has_config" variable.

    Fixes: 776180848b57 ("pinctrl: introduce driver for Atmel PIO4 controller")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Acked-by: Ludovic Desroches <ludovic.desroches@microchip.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/pinctrl/pinctrl-at91-pio4.c | 8 ++------
    1 file changed, 2 insertions(+), 6 deletions(-)

    diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c
    index e61e2f8c91ce8..e9d7977072553 100644
    --- a/drivers/pinctrl/pinctrl-at91-pio4.c
    +++ b/drivers/pinctrl/pinctrl-at91-pio4.c
    @@ -483,7 +483,6 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
    unsigned num_pins, num_configs, reserve;
    unsigned long *configs;
    struct property *pins;
    - bool has_config;
    u32 pinfunc;
    int ret, i;

    @@ -499,9 +498,6 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
    return ret;
    }

    - if (num_configs)
    - has_config = true;
    -
    num_pins = pins->length / sizeof(u32);
    if (!num_pins) {
    dev_err(pctldev->dev, "no pins found in node %pOF\n", np);
    @@ -514,7 +510,7 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
    * map for each pin.
    */
    reserve = 1;
    - if (has_config && num_pins >= 1)
    + if (num_configs)
    reserve++;
    reserve *= num_pins;
    ret = pinctrl_utils_reserve_map(pctldev, map, reserved_maps, num_maps,
    @@ -537,7 +533,7 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
    pinctrl_utils_add_map_mux(pctldev, map, reserved_maps, num_maps,
    group, func);

    - if (has_config) {
    + if (num_configs) {
    ret = pinctrl_utils_add_map_configs(pctldev, map,
    reserved_maps, num_maps, group,
    configs, num_configs,
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-11-19 06:49    [W:4.081 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site