|
@@ -1078,7 +1078,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
|
|
|
if (ret < 0) {
|
|
|
dev_err(&pdev->dev, "failed to get alias id, errno %d\n",
|
|
|
ret);
|
|
|
- goto err0;
|
|
|
+ goto err_deref_master;
|
|
|
}
|
|
|
sdd->port_id = ret;
|
|
|
} else {
|
|
@@ -1116,13 +1116,13 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
|
|
|
sdd->regs = devm_ioremap_resource(&pdev->dev, mem_res);
|
|
|
if (IS_ERR(sdd->regs)) {
|
|
|
ret = PTR_ERR(sdd->regs);
|
|
|
- goto err0;
|
|
|
+ goto err_deref_master;
|
|
|
}
|
|
|
|
|
|
if (sci->cfg_gpio && sci->cfg_gpio()) {
|
|
|
dev_err(&pdev->dev, "Unable to config gpio\n");
|
|
|
ret = -EBUSY;
|
|
|
- goto err0;
|
|
|
+ goto err_deref_master;
|
|
|
}
|
|
|
|
|
|
/* Setup clocks */
|
|
@@ -1130,13 +1130,13 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
|
|
|
if (IS_ERR(sdd->clk)) {
|
|
|
dev_err(&pdev->dev, "Unable to acquire clock 'spi'\n");
|
|
|
ret = PTR_ERR(sdd->clk);
|
|
|
- goto err0;
|
|
|
+ goto err_deref_master;
|
|
|
}
|
|
|
|
|
|
if (clk_prepare_enable(sdd->clk)) {
|
|
|
dev_err(&pdev->dev, "Couldn't enable clock 'spi'\n");
|
|
|
ret = -EBUSY;
|
|
|
- goto err0;
|
|
|
+ goto err_deref_master;
|
|
|
}
|
|
|
|
|
|
sprintf(clk_name, "spi_busclk%d", sci->src_clk_nr);
|
|
@@ -1145,13 +1145,13 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
|
|
|
dev_err(&pdev->dev,
|
|
|
"Unable to acquire clock '%s'\n", clk_name);
|
|
|
ret = PTR_ERR(sdd->src_clk);
|
|
|
- goto err2;
|
|
|
+ goto err_disable_clk;
|
|
|
}
|
|
|
|
|
|
if (clk_prepare_enable(sdd->src_clk)) {
|
|
|
dev_err(&pdev->dev, "Couldn't enable clock '%s'\n", clk_name);
|
|
|
ret = -EBUSY;
|
|
|
- goto err2;
|
|
|
+ goto err_disable_clk;
|
|
|
}
|
|
|
|
|
|
pm_runtime_set_autosuspend_delay(&pdev->dev, AUTOSUSPEND_TIMEOUT);
|
|
@@ -1171,7 +1171,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
|
|
|
if (ret != 0) {
|
|
|
dev_err(&pdev->dev, "Failed to request IRQ %d: %d\n",
|
|
|
irq, ret);
|
|
|
- goto err3;
|
|
|
+ goto err_pm_put;
|
|
|
}
|
|
|
|
|
|
writel(S3C64XX_SPI_INT_RX_OVERRUN_EN | S3C64XX_SPI_INT_RX_UNDERRUN_EN |
|
|
@@ -1181,7 +1181,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
|
|
|
ret = devm_spi_register_master(&pdev->dev, master);
|
|
|
if (ret != 0) {
|
|
|
dev_err(&pdev->dev, "cannot register SPI master: %d\n", ret);
|
|
|
- goto err3;
|
|
|
+ goto err_pm_put;
|
|
|
}
|
|
|
|
|
|
dev_dbg(&pdev->dev, "Samsung SoC SPI Driver loaded for Bus SPI-%d with %d Slaves attached\n",
|
|
@@ -1195,15 +1195,15 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
-err3:
|
|
|
+err_pm_put:
|
|
|
pm_runtime_put_noidle(&pdev->dev);
|
|
|
pm_runtime_disable(&pdev->dev);
|
|
|
pm_runtime_set_suspended(&pdev->dev);
|
|
|
|
|
|
clk_disable_unprepare(sdd->src_clk);
|
|
|
-err2:
|
|
|
+err_disable_clk:
|
|
|
clk_disable_unprepare(sdd->clk);
|
|
|
-err0:
|
|
|
+err_deref_master:
|
|
|
spi_master_put(master);
|
|
|
|
|
|
return ret;
|