Merge branch 'for-4.3/blkcg' of git://git.kernel.dk/linux-block

[firefly-linux-kernel-4.4.55.git] / drivers / pinctrl / core.c

diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 8b8f3a04c35371f439697ff6046ad6ee740e8d01..69723e07036bafbd29c6d6deb66e2f7bd7f0133e 100644 (file)
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -231,8 +231,7 @@ static int pinctrl_register_one_pin(struct pinctrl_dev *pctldev,
 
        pindesc = pin_desc_get(pctldev, number);
        if (pindesc != NULL) {
-               pr_err("pin %d already registered on %s\n", number,
-                      pctldev->desc->name);
+               dev_err(pctldev->dev, "pin %d already registered\n", number);
                return -EINVAL;
        }