aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevendra Naga <devendra.aaru@gmail.com>2012-06-16 14:13:16 -0400
committerLinus Walleij <linus.walleij@linaro.org>2012-07-03 15:51:07 -0400
commitda9aecb02d8763ef17130dfd7c678747ad84b070 (patch)
treee286ce230caabbbb09cfcac6669b87cdca899cb9
parent7e1dfe5319de9ab8c73f3934da4debd0fd88c71c (diff)
pinctrl/pinctrl-core: cleanup pinctrl_register
lots of places the ret is used just for non zero cases with out that also we can check the status of the function calls. Signed-off-by: Devendra Naga <devendra.aaru@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/pinctrl/core.c17
1 files changed, 6 insertions, 11 deletions
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 0cc053af70bd..50d9c289cffd 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -1395,9 +1395,9 @@ struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc,
1395 struct pinctrl_dev *pctldev; 1395 struct pinctrl_dev *pctldev;
1396 int ret; 1396 int ret;
1397 1397
1398 if (pctldesc == NULL) 1398 if (!pctldesc)
1399 return NULL; 1399 return NULL;
1400 if (pctldesc->name == NULL) 1400 if (!pctldesc->name)
1401 return NULL; 1401 return NULL;
1402 1402
1403 pctldev = kzalloc(sizeof(*pctldev), GFP_KERNEL); 1403 pctldev = kzalloc(sizeof(*pctldev), GFP_KERNEL);
@@ -1415,23 +1415,20 @@ struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc,
1415 pctldev->dev = dev; 1415 pctldev->dev = dev;
1416 1416
1417 /* check core ops for sanity */ 1417 /* check core ops for sanity */
1418 ret = pinctrl_check_ops(pctldev); 1418 if (pinctrl_check_ops(pctldev)) {
1419 if (ret) {
1420 dev_err(dev, "pinctrl ops lacks necessary functions\n"); 1419 dev_err(dev, "pinctrl ops lacks necessary functions\n");
1421 goto out_err; 1420 goto out_err;
1422 } 1421 }
1423 1422
1424 /* If we're implementing pinmuxing, check the ops for sanity */ 1423 /* If we're implementing pinmuxing, check the ops for sanity */
1425 if (pctldesc->pmxops) { 1424 if (pctldesc->pmxops) {
1426 ret = pinmux_check_ops(pctldev); 1425 if (pinmux_check_ops(pctldev))
1427 if (ret)
1428 goto out_err; 1426 goto out_err;
1429 } 1427 }
1430 1428
1431 /* If we're implementing pinconfig, check the ops for sanity */ 1429 /* If we're implementing pinconfig, check the ops for sanity */
1432 if (pctldesc->confops) { 1430 if (pctldesc->confops) {
1433 ret = pinconf_check_ops(pctldev); 1431 if (pinconf_check_ops(pctldev))
1434 if (ret)
1435 goto out_err; 1432 goto out_err;
1436 } 1433 }
1437 1434
@@ -1457,11 +1454,9 @@ struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc,
1457 if (IS_ERR(s)) { 1454 if (IS_ERR(s)) {
1458 dev_dbg(dev, "failed to lookup the default state\n"); 1455 dev_dbg(dev, "failed to lookup the default state\n");
1459 } else { 1456 } else {
1460 ret = pinctrl_select_state_locked(pctldev->p, s); 1457 if (pinctrl_select_state_locked(pctldev->p, s))
1461 if (ret) {
1462 dev_err(dev, 1458 dev_err(dev,
1463 "failed to select default state\n"); 1459 "failed to select default state\n");
1464 }
1465 } 1460 }
1466 } 1461 }
1467 1462