spi/omap: Correct the error path

Currently McSPI driver doesnt follow correct failure fallback steps attempting to correct the same. Also: - label names changed to give meaningful names. - Setting the driver data to NULL in remove Signed-off-by: Hebbar, Gururaja <gururaja.hebbar@ti.com> Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

spi/omap: Correct the error path
Currently McSPI driver doesnt follow correct failure fallback steps attempting to correct the same. Also: - label names changed to give meaningful names. - Setting the driver data to NULL in remove Signed-off-by: Hebbar, Gururaja <gururaja.hebbar@ti.com> Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Shubhrajyoti D · Grant Likely
1 parent 751c925cbb
Showing 1 changed file with 20 additions and 12 deletions Side-by-side Diff
drivers/spi/spi-omap2-mcspi.c
@@ -1115,13 +1115,13 @@
 	mcspi->wq = alloc_workqueue(wq_name, WQ_MEM_RECLAIM, 1);
 	if (mcspi->wq == NULL) {
 		status = -ENOMEM;
-		goto err1;
+		goto free_master;
 	}
  
 	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (r == NULL) {
 		status = -ENODEV;
-		goto err1;
+		goto free_master;
 	}
  
 	r->start += pdata->regs_offset;
  
@@ -1130,14 +1130,14 @@
 	if (!request_mem_region(r->start, resource_size(r),
 				dev_name(&pdev->dev))) {
 		status = -EBUSY;
-		goto err1;
+		goto free_master;
 	}
  
 	mcspi->base = ioremap(r->start, resource_size(r));
 	if (!mcspi->base) {
 		dev_dbg(&pdev->dev, "can't ioremap MCSPI\n");
 		status = -ENOMEM;
-		goto err2;
+		goto release_region;
 	}
  
 	mcspi->dev = &pdev->dev;
@@ -1152,7 +1152,7 @@
 			GFP_KERNEL);
  
 	if (mcspi->dma_channels == NULL)
-		goto err2;
+		goto unmap_io;
  
 	for (i = 0; i < master->num_chipselect; i++) {
 		char dma_ch_name[14];
  
  
  
  
  
  
  
@@ -1182,26 +1182,33 @@
 		mcspi->dma_channels[i].dma_tx_sync_dev = dma_res->start;
 	}
  
+	if (status < 0)
+		goto dma_chnl_free;
+
 	pm_runtime_enable(&pdev->dev);
  
 	if (status || omap2_mcspi_master_setup(mcspi) < 0)
-		goto err3;
+		goto disable_pm;
  
 	status = spi_register_master(master);
 	if (status < 0)
-		goto err4;
+		goto err_spi_register;
  
 	return status;
  
-err4:
+err_spi_register:
 	spi_master_put(master);
-err3:
+disable_pm:
 	pm_runtime_disable(&pdev->dev);
+dma_chnl_free:
 	kfree(mcspi->dma_channels);
-err2:
-	release_mem_region(r->start, resource_size(r));
+unmap_io:
 	iounmap(mcspi->base);
-err1:
+release_region:
+	release_mem_region(r->start, resource_size(r));
+free_master:
+	kfree(master);
+	platform_set_drvdata(pdev, NULL);
 	return status;
 }
  
@@ -1227,6 +1234,7 @@
 	iounmap(base);
 	kfree(dma_channels);
 	destroy_workqueue(mcspi->wq);
+	platform_set_drvdata(pdev, NULL);
  
 	return 0;
 }
...	...	@@ -1115,13 +1115,13 @@
1115	1115	mcspi->wq = alloc_workqueue(wq_name, WQ_MEM_RECLAIM, 1);
1116	1116	if (mcspi->wq == NULL) {
1117	1117	status = -ENOMEM;
1118		- goto err1;
	1118	+ goto free_master;
1119	1119	}
1120	1120
1121	1121	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
1122	1122	if (r == NULL) {
1123	1123	status = -ENODEV;
1124		- goto err1;
	1124	+ goto free_master;
1125	1125	}
1126	1126
1127	1127	r->start += pdata->regs_offset;
1128	1128
...	...	@@ -1130,14 +1130,14 @@
1130	1130	if (!request_mem_region(r->start, resource_size(r),
1131	1131	dev_name(&pdev->dev))) {
1132	1132	status = -EBUSY;
1133		- goto err1;
	1133	+ goto free_master;
1134	1134	}
1135	1135
1136	1136	mcspi->base = ioremap(r->start, resource_size(r));
1137	1137	if (!mcspi->base) {
1138	1138	dev_dbg(&pdev->dev, "can't ioremap MCSPI\n");
1139	1139	status = -ENOMEM;
1140		- goto err2;
	1140	+ goto release_region;
1141	1141	}
1142	1142
1143	1143	mcspi->dev = &pdev->dev;
...	...	@@ -1152,7 +1152,7 @@
1152	1152	GFP_KERNEL);
1153	1153
1154	1154	if (mcspi->dma_channels == NULL)
1155		- goto err2;
	1155	+ goto unmap_io;
1156	1156
1157	1157	for (i = 0; i < master->num_chipselect; i++) {
1158	1158	char dma_ch_name[14];
1159	1159
1160	1160
1161	1161
1162	1162
1163	1163
1164	1164
1165	1165
...	...	@@ -1182,26 +1182,33 @@
1182	1182	mcspi->dma_channels[i].dma_tx_sync_dev = dma_res->start;
1183	1183	}
1184	1184
	1185	+ if (status < 0)
	1186	+ goto dma_chnl_free;
	1187	+
1185	1188	pm_runtime_enable(&pdev->dev);
1186	1189
1187	1190	if (status \|\| omap2_mcspi_master_setup(mcspi) < 0)
1188		- goto err3;
	1191	+ goto disable_pm;
1189	1192
1190	1193	status = spi_register_master(master);
1191	1194	if (status < 0)
1192		- goto err4;
	1195	+ goto err_spi_register;
1193	1196
1194	1197	return status;
1195	1198
1196		-err4:
	1199	+err_spi_register:
1197	1200	spi_master_put(master);
1198		-err3:
	1201	+disable_pm:
1199	1202	pm_runtime_disable(&pdev->dev);
	1203	+dma_chnl_free:
1200	1204	kfree(mcspi->dma_channels);
1201		-err2:
1202		- release_mem_region(r->start, resource_size(r));
	1205	+unmap_io:
1203	1206	iounmap(mcspi->base);
1204		-err1:
	1207	+release_region:
	1208	+ release_mem_region(r->start, resource_size(r));
	1209	+free_master:
	1210	+ kfree(master);
	1211	+ platform_set_drvdata(pdev, NULL);
1205	1212	return status;
1206	1213	}
1207	1214
...	...	@@ -1227,6 +1234,7 @@
1227	1234	iounmap(base);
1228	1235	kfree(dma_channels);
1229	1236	destroy_workqueue(mcspi->wq);
	1237	+ platform_set_drvdata(pdev, NULL);
1230	1238
1231	1239	return 0;
1232	1240	}