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

Commit 95dcd4ae authored by Stephen Warren's avatar Stephen Warren Committed by Linus Walleij
Browse files

pinctrl: use dev_*() instead of pr_*(), add some msgs, minor cleanups 



e.g. dev_err instead of pr_err prints messages in a slightly more
standardized format.

Also, add a few more error messages to track down errors.

Also, some small cleanups of messages.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Acked-by: default avatarDong Aisheng <dong.aisheng@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 1681f5ae

drivers/pinctrl/core.c

+21 −12
Original line number Diff line number Diff line
@@ -212,8 +212,10 @@ static int pinctrl_register_one_pin(struct pinctrl_dev *pctldev, 
	}



	pindesc = kzalloc(sizeof(*pindesc), GFP_KERNEL);

	if (pindesc == NULL)

	if (pindesc == NULL) {

		dev_err(pctldev->dev, "failed to alloc struct pin_desc\n");

		return -ENOMEM;

	}



	spin_lock_init(&pindesc->lock);
@@ -493,7 +495,7 @@ static struct pinctrl *pinctrl_get_locked(struct device *dev, const char *name) 


	devname = dev_name(dev);



	pr_debug("get pin control handle device %s state %s\n", devname, name);

	dev_dbg(dev, "pinctrl_get() for device %s state %s\n", devname, name);



	/*

	 * create the state cookie holder struct pinctrl for each
@@ -501,8 +503,10 @@ static struct pinctrl *pinctrl_get_locked(struct device *dev, const char *name) 
	 * a pin control handle with pinctrl_get()

	 */

	p = kzalloc(sizeof(struct pinctrl), GFP_KERNEL);

	if (p == NULL)

	if (p == NULL) {

		dev_err(dev, "failed to alloc struct pinctrl\n");

		return ERR_PTR(-ENOMEM);

	}

	mutex_init(&p->mutex);

	pinmux_init_pinctrl_handle(p);
@@ -521,7 +525,7 @@ static struct pinctrl *pinctrl_get_locked(struct device *dev, const char *name) 
			return ERR_PTR(-ENODEV);

		}



		pr_debug("in map, found pctldev %s to handle function %s",

		dev_dbg(dev, "in map, found pctldev %s to handle function %s",

			dev_name(pctldev->dev), map->function);



		/* Map must be for this device */
@@ -558,7 +562,7 @@ static struct pinctrl *pinctrl_get_locked(struct device *dev, const char *name) 
	if (!num_maps)

		dev_info(dev, "zero maps found for mapping %s\n", name);



	pr_debug("found %u mux maps for device %s, UD %s\n",

	dev_dbg(dev, "found %u maps for device %s state %s\n",

		num_maps, devname, name ? name : "(undefined)");



	/* Add the pinmux to the global list */
@@ -702,6 +706,7 @@ int pinctrl_register_mappings(struct pinctrl_map const *maps, 
	maps_node->num_maps = num_maps;

	maps_node->maps = kmemdup(maps, sizeof(*maps) * num_maps, GFP_KERNEL);

	if (!maps_node->maps) {

		pr_err("failed to duplicate mapping table\n");

		kfree(maps_node);

		return -ENOMEM;

	}
@@ -722,8 +727,10 @@ static int pinctrl_hog_map(struct pinctrl_dev *pctldev, 
	int ret;



	hog = kzalloc(sizeof(struct pinctrl_hog), GFP_KERNEL);

	if (!hog)

	if (!hog) {

		dev_err(pctldev->dev, "failed to alloc struct pinctrl_hog\n");

		return -ENOMEM;

	}



	p = pinctrl_get_locked(pctldev->dev, map->name);

	if (IS_ERR(p)) {
@@ -1154,8 +1161,10 @@ struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc, 
		return NULL;



	pctldev = kzalloc(sizeof(struct pinctrl_dev), GFP_KERNEL);

	if (pctldev == NULL)

	if (pctldev == NULL) {

		dev_err(dev, "failed to alloc struct pinctrl_dev\n");

		return NULL;

	}



	/* Initialize pin control device struct */

	pctldev->owner = pctldesc->owner;