]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
pinctrl: nomadik: follow conditional kernel coding conventions
authorThéo Lebrun <theo.lebrun@bootlin.com>
Wed, 28 Feb 2024 11:28:11 +0000 (12:28 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Thu, 29 Feb 2024 09:28:21 +0000 (10:28 +0100)
Fix strict checkpatch warnings relative to if-else blocks and bool
expressions. Message types addressed:

   CHECK: Comparison to NULL could be written "!nmk_cfg_params[index].choice"
   CHECK: Unbalanced braces around else statement
   CHECK: Using comparison to false is error prone
   CHECK: Using comparison to true is error prone
   CHECK: braces {} should be used on all arms of this statement

Before: 0 errors, 1 warnings, 16 checks.
After:  0 errors, 1 warnings,  7 checks.

Signed-off-by: Théo Lebrun <theo.lebrun@bootlin.com>
Link: https://lore.kernel.org/r/20240228-mbly-gpio-v2-13-3ba757474006@bootlin.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/nomadik/pinctrl-nomadik.c

index 95181ab575e0197582871843831d7b51e2566d82..b7437830222964eb164741e120a7c404d0ae0363 100644 (file)
@@ -378,7 +378,7 @@ static void nmk_prcm_altcx_set_mode(struct nmk_pinctrl *npct,
         */
        if (!alt_num) {
                for (i = 0 ; i < PRCM_IDX_GPIOCR_ALTC_MAX ; i++) {
-                       if (pin_desc->altcx[i].used == true) {
+                       if (pin_desc->altcx[i].used) {
                                reg = gpiocr_regs[pin_desc->altcx[i].reg_index];
                                bit = pin_desc->altcx[i].control_bit;
                                if (readl(npct->prcm_base + reg) & BIT(bit)) {
@@ -393,7 +393,7 @@ static void nmk_prcm_altcx_set_mode(struct nmk_pinctrl *npct,
        }
 
        alt_index = alt_num - 1;
-       if (pin_desc->altcx[alt_index].used == false) {
+       if (!pin_desc->altcx[alt_index].used) {
                dev_warn(npct->dev,
                         "PRCM GPIOCR: pin %i: alternate-C%i does not exist\n",
                         offset, alt_num);
@@ -407,7 +407,7 @@ static void nmk_prcm_altcx_set_mode(struct nmk_pinctrl *npct,
        for (i = 0 ; i < PRCM_IDX_GPIOCR_ALTC_MAX ; i++) {
                if (i == alt_index)
                        continue;
-               if (pin_desc->altcx[i].used == true) {
+               if (pin_desc->altcx[i].used) {
                        reg = gpiocr_regs[pin_desc->altcx[i].reg_index];
                        bit = pin_desc->altcx[i].control_bit;
                        if (readl(npct->prcm_base + reg) & BIT(bit)) {
@@ -495,7 +495,7 @@ int __maybe_unused nmk_prcm_gpiocr_get_mode(struct pinctrl_dev *pctldev, int gpi
        pin_desc = npct->soc->altcx_pins + i;
        gpiocr_regs = npct->soc->prcm_gpiocr_registers;
        for (i = 0; i < PRCM_IDX_GPIOCR_ALTC_MAX; i++) {
-               if (pin_desc->altcx[i].used == true) {
+               if (pin_desc->altcx[i].used) {
                        reg = gpiocr_regs[pin_desc->altcx[i].reg_index];
                        bit = pin_desc->altcx[i].control_bit;
                        if (readl(npct->prcm_base + reg) & BIT(bit))
@@ -677,9 +677,9 @@ static const struct nmk_cfg_param nmk_cfg_params[] = {
 
 static int nmk_dt_pin_config(int index, int val, unsigned long *config)
 {
-       if (nmk_cfg_params[index].choice == NULL)
+       if (!nmk_cfg_params[index].choice) {
                *config = nmk_cfg_params[index].config;
-       else {
+       else {
                /* test if out of range */
                if  (val < nmk_cfg_params[index].size) {
                        *config = nmk_cfg_params[index].config |
@@ -1105,9 +1105,9 @@ static int nmk_pin_config_set(struct pinctrl_dev *pctldev, unsigned int pin,
                if (gpiomode)
                        /* No glitch when going to GPIO mode */
                        __nmk_gpio_set_mode(nmk_chip, bit, NMK_GPIO_ALT_GPIO);
-               if (output)
+               if (output) {
                        __nmk_gpio_make_output(nmk_chip, bit, val);
-               else {
+               else {
                        __nmk_gpio_make_input(nmk_chip, bit);
                        __nmk_gpio_set_pull(nmk_chip, bit, pull);
                }