summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-05-06 12:43:25 +0900
committerLinus Walleij <linus.walleij@linaro.org>2013-06-16 11:56:48 +0200
commit3e6eeafc9cd3dcf5555ee4823ff609acbcfd7b25 (patch)
tree1e7b139c2ddfe564b3f18457f4f2af10a58fb23d
parent59eb14dcc6260aacfa0afdf11fd0292a8bba94c1 (diff)
pinctrl: sirf: remove unnecessary platform_set_drvdata()
The driver core clears the driver data to NULL after device_release or on probe failure, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d (device-core: Ensure drvdata = NULL when no driver is bound). Thus, it is not needed to manually clear the device driver data to NULL. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/pinctrl/pinctrl-sirf.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/pinctrl/pinctrl-sirf.c b/drivers/pinctrl/pinctrl-sirf.c
index bc9d1be27fb0..d704f3b525f5 100644
--- a/drivers/pinctrl/pinctrl-sirf.c
+++ b/drivers/pinctrl/pinctrl-sirf.c
@@ -1280,9 +1280,8 @@ static int sirfsoc_pinmux_probe(struct platform_device *pdev)
spmx->gpio_virtbase = of_iomap(np, 0);
if (!spmx->gpio_virtbase) {
- ret = -ENOMEM;
dev_err(&pdev->dev, "can't map gpio registers\n");
- goto out_no_gpio_remap;
+ return -ENOMEM;
}
spmx->rsc_virtbase = sirfsoc_rsc_of_iomap();
@@ -1316,8 +1315,6 @@ out_no_pmx:
iounmap(spmx->rsc_virtbase);
out_no_rsc_remap:
iounmap(spmx->gpio_virtbase);
-out_no_gpio_remap:
- platform_set_drvdata(pdev, NULL);
return ret;
}