浏览代码

gpio: ts5500: Use devm_gpiochip_add_data() for gpio registration

Use devm_gpiochip_add_data() for GPIO registration and clean the
error path.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Laxman Dewangan 9 年之前
父节点
当前提交
973eff01c5
共有 1 个文件被更改,包括 3 次插入6 次删除
  1. 3 6
      drivers/gpio/gpio-ts5500.c

+ 3 - 6
drivers/gpio/gpio-ts5500.c

@@ -409,7 +409,7 @@ static int ts5500_dio_probe(struct platform_device *pdev)
 		break;
 		break;
 	}
 	}
 
 
-	ret = gpiochip_add_data(&priv->gpio_chip, priv);
+	ret = devm_gpiochip_add_data(dev, &priv->gpio_chip, priv);
 	if (ret) {
 	if (ret) {
 		dev_err(dev, "failed to register the gpio chip\n");
 		dev_err(dev, "failed to register the gpio chip\n");
 		return ret;
 		return ret;
@@ -418,13 +418,10 @@ static int ts5500_dio_probe(struct platform_device *pdev)
 	ret = ts5500_enable_irq(priv);
 	ret = ts5500_enable_irq(priv);
 	if (ret) {
 	if (ret) {
 		dev_err(dev, "invalid interrupt %d\n", priv->hwirq);
 		dev_err(dev, "invalid interrupt %d\n", priv->hwirq);
-		goto cleanup;
+		return ret;
 	}
 	}
 
 
 	return 0;
 	return 0;
-cleanup:
-	gpiochip_remove(&priv->gpio_chip);
-	return ret;
 }
 }
 
 
 static int ts5500_dio_remove(struct platform_device *pdev)
 static int ts5500_dio_remove(struct platform_device *pdev)
@@ -432,7 +429,7 @@ static int ts5500_dio_remove(struct platform_device *pdev)
 	struct ts5500_priv *priv = platform_get_drvdata(pdev);
 	struct ts5500_priv *priv = platform_get_drvdata(pdev);
 
 
 	ts5500_disable_irq(priv);
 	ts5500_disable_irq(priv);
-	gpiochip_remove(&priv->gpio_chip);
+
 	return 0;
 	return 0;
 }
 }