瀏覽代碼

mmc: dw_mmc: eliminate useless usage of ret

In few places usage of ret variable is not needed.
This patch simplifies those pieces of code.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Seungwon Jeon <tgih.jun@samsung.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Andy Shevchenko 12 年之前
父節點
當前提交
dd36980020
共有 2 個文件被更改,包括 5 次插入20 次删除
  1. 2 6
      drivers/mmc/host/dw_mmc-pci.c
  2. 3 14
      drivers/mmc/host/dw_mmc-pltfm.c

+ 2 - 6
drivers/mmc/host/dw_mmc-pci.c

@@ -100,22 +100,18 @@ static void dw_mci_pci_remove(struct pci_dev *pdev)
 #ifdef CONFIG_PM_SLEEP
 #ifdef CONFIG_PM_SLEEP
 static int dw_mci_pci_suspend(struct device *dev)
 static int dw_mci_pci_suspend(struct device *dev)
 {
 {
-	int ret;
 	struct pci_dev *pdev = to_pci_dev(dev);
 	struct pci_dev *pdev = to_pci_dev(dev);
 	struct dw_mci *host = pci_get_drvdata(pdev);
 	struct dw_mci *host = pci_get_drvdata(pdev);
 
 
-	ret = dw_mci_suspend(host);
-	return ret;
+	return dw_mci_suspend(host);
 }
 }
 
 
 static int dw_mci_pci_resume(struct device *dev)
 static int dw_mci_pci_resume(struct device *dev)
 {
 {
-	int ret;
 	struct pci_dev *pdev = to_pci_dev(dev);
 	struct pci_dev *pdev = to_pci_dev(dev);
 	struct dw_mci *host = pci_get_drvdata(pdev);
 	struct dw_mci *host = pci_get_drvdata(pdev);
 
 
-	ret = dw_mci_resume(host);
-	return ret;
+	return dw_mci_resume(host);
 }
 }
 #else
 #else
 #define dw_mci_pci_suspend	NULL
 #define dw_mci_pci_suspend	NULL

+ 3 - 14
drivers/mmc/host/dw_mmc-pltfm.c

@@ -56,8 +56,7 @@ int dw_mci_pltfm_register(struct platform_device *pdev,
 	}
 	}
 
 
 	platform_set_drvdata(pdev, host);
 	platform_set_drvdata(pdev, host);
-	ret = dw_mci_probe(host);
-	return ret;
+	return dw_mci_probe(host);
 }
 }
 EXPORT_SYMBOL_GPL(dw_mci_pltfm_register);
 EXPORT_SYMBOL_GPL(dw_mci_pltfm_register);
 
 
@@ -81,26 +80,16 @@ EXPORT_SYMBOL_GPL(dw_mci_pltfm_remove);
  */
  */
 static int dw_mci_pltfm_suspend(struct device *dev)
 static int dw_mci_pltfm_suspend(struct device *dev)
 {
 {
-	int ret;
 	struct dw_mci *host = dev_get_drvdata(dev);
 	struct dw_mci *host = dev_get_drvdata(dev);
 
 
-	ret = dw_mci_suspend(host);
-	if (ret)
-		return ret;
-
-	return 0;
+	return dw_mci_suspend(host);
 }
 }
 
 
 static int dw_mci_pltfm_resume(struct device *dev)
 static int dw_mci_pltfm_resume(struct device *dev)
 {
 {
-	int ret;
 	struct dw_mci *host = dev_get_drvdata(dev);
 	struct dw_mci *host = dev_get_drvdata(dev);
 
 
-	ret = dw_mci_resume(host);
-	if (ret)
-		return ret;
-
-	return 0;
+	return dw_mci_resume(host);
 }
 }
 #else
 #else
 #define dw_mci_pltfm_suspend	NULL
 #define dw_mci_pltfm_suspend	NULL