]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
pinctrl: Adjust nine checks for null pointers
authorMarkus Elfring <elfring@users.sourceforge.net>
Tue, 2 May 2017 09:04:55 +0000 (11:04 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Mon, 22 May 2017 08:39:25 +0000 (10:39 +0200)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The script “checkpatch.pl” pointed information out like the following.

Comparison to NULL could be written …

Thus fix the affected source code places.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/core.c

index 7df16771fa13dcd121e562beb367ff4a3cca7a36..b1044f07e0a116c4ad7ff3b65b1001e8927a78a0 100644 (file)
@@ -170,7 +170,7 @@ const char *pin_get_name(struct pinctrl_dev *pctldev, const unsigned pin)
        const struct pin_desc *desc;
 
        desc = pin_desc_get(pctldev, pin);
-       if (desc == NULL) {
+       if (!desc) {
                dev_err(pctldev->dev, "failed to get pin(%d) name\n",
                        pin);
                return NULL;
@@ -214,7 +214,7 @@ static void pinctrl_free_pindescs(struct pinctrl_dev *pctldev,
 
                pindesc = radix_tree_lookup(&pctldev->pin_desc_tree,
                                            pins[i].number);
-               if (pindesc != NULL) {
+               if (pindesc) {
                        radix_tree_delete(&pctldev->pin_desc_tree,
                                          pins[i].number);
                        if (pindesc->dynamic_name)
@@ -230,7 +230,7 @@ static int pinctrl_register_one_pin(struct pinctrl_dev *pctldev,
        struct pin_desc *pindesc;
 
        pindesc = pin_desc_get(pctldev, pin->number);
-       if (pindesc != NULL) {
+       if (pindesc) {
                dev_err(pctldev->dev, "pin %d already registered\n",
                        pin->number);
                return -EINVAL;
@@ -248,7 +248,7 @@ static int pinctrl_register_one_pin(struct pinctrl_dev *pctldev,
                pindesc->name = pin->name;
        } else {
                pindesc->name = kasprintf(GFP_KERNEL, "PIN%u", pin->number);
-               if (pindesc->name == NULL) {
+               if (!pindesc->name) {
                        kfree(pindesc);
                        return -ENOMEM;
                }
@@ -402,7 +402,7 @@ static int pinctrl_get_device_gpio_range(unsigned gpio,
                struct pinctrl_gpio_range *range;
 
                range = pinctrl_match_gpio_range(pctldev, gpio);
-               if (range != NULL) {
+               if (range) {
                        *outdev = pctldev;
                        *outrange = range;
                        mutex_unlock(&pinctrldev_list_mutex);
@@ -947,7 +947,7 @@ static int add_setting(struct pinctrl *p, struct pinctrl_dev *pctldev,
        else
                setting->pctldev =
                        get_pinctrl_dev_from_devname(map->ctrl_dev_name);
-       if (setting->pctldev == NULL) {
+       if (!setting->pctldev) {
                kfree(setting);
                /* Do not defer probing of hogs (circular loop) */
                if (!strcmp(map->ctrl_dev_name, map->dev_name))
@@ -1094,7 +1094,7 @@ struct pinctrl *pinctrl_get(struct device *dev)
         * return another pointer to it.
         */
        p = find_pinctrl(dev);
-       if (p != NULL) {
+       if (p) {
                dev_dbg(dev, "obtain a copy of previously claimed pinctrl\n");
                kref_get(&p->users);
                return p;
@@ -1565,7 +1565,7 @@ static int pinctrl_pins_show(struct seq_file *s, void *what)
                pin = pctldev->desc->pins[i].number;
                desc = pin_desc_get(pctldev, pin);
                /* Pin space may be sparse */
-               if (desc == NULL)
+               if (!desc)
                        continue;
 
                seq_printf(s, "pin %d (%s) ", pin, desc->name);
@@ -2145,7 +2145,7 @@ void pinctrl_unregister(struct pinctrl_dev *pctldev)
 {
        struct pinctrl_gpio_range *range, *n;
 
-       if (pctldev == NULL)
+       if (!pctldev)
                return;
 
        mutex_lock(&pctldev->mutex);