]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
pinctrl: samsung: Remove dead code
authorMarek Szyprowski <m.szyprowski@samsung.com>
Thu, 26 Jan 2017 09:29:22 +0000 (10:29 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Thu, 26 Jan 2017 15:34:54 +0000 (16:34 +0100)
'enable' parameter has been removed a while ago, so all code for handling
it can be simply removed.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Acked-by: Tomasz Figa <tomasz.figa@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/samsung/pinctrl-samsung.c

index e187d5ed2c27a21f79640bcd5da772ae73e6fa45..59f99ea7e65bb117ea9746bba82032e65b2fc3eb 100644 (file)
@@ -351,7 +351,7 @@ static void pin_to_reg_bank(struct samsung_pinctrl_drv_data *drvdata,
 
 /* enable or disable a pinmux function */
 static void samsung_pinmux_setup(struct pinctrl_dev *pctldev, unsigned selector,
-                                       unsigned group, bool enable)
+                                       unsigned group)
 {
        struct samsung_pinctrl_drv_data *drvdata;
        const struct samsung_pin_bank_type *type;
@@ -381,8 +381,7 @@ static void samsung_pinmux_setup(struct pinctrl_dev *pctldev, unsigned selector,
 
        data = readl(reg + type->reg_offset[PINCFG_TYPE_FUNC]);
        data &= ~(mask << shift);
-       if (enable)
-               data |= func->val << shift;
+       data |= func->val << shift;
        writel(data, reg + type->reg_offset[PINCFG_TYPE_FUNC]);
 
        spin_unlock_irqrestore(&bank->slock, flags);
@@ -393,7 +392,7 @@ static int samsung_pinmux_set_mux(struct pinctrl_dev *pctldev,
                                  unsigned selector,
                                  unsigned group)
 {
-       samsung_pinmux_setup(pctldev, selector, group, true);
+       samsung_pinmux_setup(pctldev, selector, group);
        return 0;
 }