diff options
author | Varka Bhadram <varkabhadram@gmail.com> | 2014-10-21 05:06:59 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2014-10-28 12:15:20 -0400 |
commit | aa2c35e5a66194f36578345a23708851935bdff6 (patch) | |
tree | 46971d3ed2c7d68d8fb2d8c501c4f83b48b52155 | |
parent | eec450713e5c5cafa9b8565c84548580080b1f64 (diff) |
pinctrl-tb10x: remove duplicate check on resource
Sanity check on resource happening with devm_ioremap_resource().
Signed-off-by: Varka Bhadram <varkab@cdac.in>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r-- | drivers/pinctrl/pinctrl-tb10x.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/pinctrl/pinctrl-tb10x.c b/drivers/pinctrl/pinctrl-tb10x.c index 3b9bfcf717ac..9363563f9777 100644 --- a/drivers/pinctrl/pinctrl-tb10x.c +++ b/drivers/pinctrl/pinctrl-tb10x.c | |||
@@ -759,7 +759,7 @@ static struct pinctrl_desc tb10x_pindesc = { | |||
759 | static int tb10x_pinctrl_probe(struct platform_device *pdev) | 759 | static int tb10x_pinctrl_probe(struct platform_device *pdev) |
760 | { | 760 | { |
761 | int ret = -EINVAL; | 761 | int ret = -EINVAL; |
762 | struct resource *mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 762 | struct resource *mem; |
763 | struct device *dev = &pdev->dev; | 763 | struct device *dev = &pdev->dev; |
764 | struct device_node *of_node = dev->of_node; | 764 | struct device_node *of_node = dev->of_node; |
765 | struct device_node *child; | 765 | struct device_node *child; |
@@ -771,11 +771,6 @@ static int tb10x_pinctrl_probe(struct platform_device *pdev) | |||
771 | return -EINVAL; | 771 | return -EINVAL; |
772 | } | 772 | } |
773 | 773 | ||
774 | if (!mem) { | ||
775 | dev_err(dev, "No memory resource defined.\n"); | ||
776 | return -EINVAL; | ||
777 | } | ||
778 | |||
779 | state = devm_kzalloc(dev, sizeof(struct tb10x_pinctrl) + | 774 | state = devm_kzalloc(dev, sizeof(struct tb10x_pinctrl) + |
780 | of_get_child_count(of_node) | 775 | of_get_child_count(of_node) |
781 | * sizeof(struct tb10x_of_pinfunc), | 776 | * sizeof(struct tb10x_of_pinfunc), |
@@ -787,6 +782,7 @@ static int tb10x_pinctrl_probe(struct platform_device *pdev) | |||
787 | state->pinfuncs = (struct tb10x_of_pinfunc *)(state + 1); | 782 | state->pinfuncs = (struct tb10x_of_pinfunc *)(state + 1); |
788 | mutex_init(&state->mutex); | 783 | mutex_init(&state->mutex); |
789 | 784 | ||
785 | mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
790 | state->base = devm_ioremap_resource(dev, mem); | 786 | state->base = devm_ioremap_resource(dev, mem); |
791 | if (IS_ERR(state->base)) { | 787 | if (IS_ERR(state->base)) { |
792 | ret = PTR_ERR(state->base); | 788 | ret = PTR_ERR(state->base); |