From 8de7ccc7279b6e1fbbdd17a1f4123049296f98a7 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Tue, 14 Feb 2012 10:50:41 -0700 Subject: [PATCH] --- yaml --- r: 294065 b: refs/heads/master c: 449d16b025ac38c7b62af5fb6ef4b833d78e690d h: refs/heads/master i: 294063: 0903cb5e195065f825e16d26936eb161da6334e3 v: v3 --- [refs] | 2 +- trunk/drivers/pinctrl/core.c | 14 +------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 940f6b400516..c7a7d38e9948 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c9bdc3f52d20c9bc6c2552c6d3ec5bfa4119f75 +refs/heads/master: 449d16b025ac38c7b62af5fb6ef4b833d78e690d diff --git a/trunk/drivers/pinctrl/core.c b/trunk/drivers/pinctrl/core.c index c5f76ad5a8c5..8a91eb24eb52 100644 --- a/trunk/drivers/pinctrl/core.c +++ b/trunk/drivers/pinctrl/core.c @@ -725,23 +725,11 @@ static int pinctrl_hog_map(struct pinctrl_dev *pctldev, struct pinctrl *p; int ret; - if (map->dev_name) { - /* - * TODO: the day we have device tree support, we can - * traverse the device tree and hog to specific device nodes - * without any problems, so then we can hog pinmuxes for - * all devices that just want a static pin mux at this point. - */ - dev_err(pctldev->dev, "map %s wants to hog a non-system pinmux, this is not going to work\n", - map->name); - return -EINVAL; - } - hog = kzalloc(sizeof(struct pinctrl_hog), GFP_KERNEL); if (!hog) return -ENOMEM; - p = pinctrl_get(NULL, map->name); + p = pinctrl_get(pctldev->dev, map->name); if (IS_ERR(p)) { kfree(hog); dev_err(pctldev->dev,