diff options
| author |   Antoine Tenart <antoine.tenart@free-electrons.com> | 2015-05-16 01:21:39 +0200 |
|---|---|---|
| committer |   Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2015-05-18 18:10:08 +0200 |
| commit | f90bec209ca54d799e69fc30c1b04c14baab980a (patch) | |
| tree | a9fba89dc1d39867ce31b1cc43177c5d6932377f /drivers/pinctrl/berlin/berlin.c | |
| parent | ARM: berlin: move pinctrl to simple-mfd nodes (diff) | |
| download | linux-dev-f90bec209ca54d799e69fc30c1b04c14baab980a.tar.xz linux-dev-f90bec209ca54d799e69fc30c1b04c14baab980a.zip | |
pinctrl: berlin: drop SoC stub provided regmap
With convertsion to simple-mfd sub-nodes, drop the regmap registration
by SoC stubs.
Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Diffstat (limited to 'drivers/pinctrl/berlin/berlin.c')
| -rw-r--r-- | drivers/pinctrl/berlin/berlin.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pinctrl/berlin/berlin.c b/drivers/pinctrl/berlin/berlin.c index 28551123d04f..65b0e211b89e 100644 --- a/drivers/pinctrl/berlin/berlin.c +++ b/drivers/pinctrl/berlin/berlin.c @@ -301,9 +301,7 @@ int berlin_pinctrl_probe(struct platform_device *pdev, struct regmap *regmap; int ret; - regmap = dev_get_regmap(&pdev->dev, NULL); - if (!regmap) - regmap = syscon_node_to_regmap(parent_np); + regmap = syscon_node_to_regmap(parent_np); of_node_put(parent_np); if (IS_ERR(regmap)) return PTR_ERR(regmap); |