Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cea234e9 authored by Markus Elfring's avatar Markus Elfring Committed by Linus Walleij
Browse files

pinctrl: Adjust nine checks for null pointers 



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: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 390e1046

drivers/pinctrl/core.c

+9 −9
Original line number Diff line number Diff line
@@ -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);