Merge patch series "scsi: Convert to platform remove callback returning" void

martinkpetersen · martinkpetersen · commit e78e59acfb69 · 2023-12-05T21:54:06.000-05:00
Uwe Kleine-König <u.kleine-koenig@pengutronix.de> says: Hello, this series converts all drivers below drivers/scsi to struct platform_driver::remove_new(). See commit 5c5a768 ("platform: Provide a remove callback that returns no value") for an extended explanation and the eventual goal. All conversations are trivial, because all .remove() callbacks returned zero unconditionally. Best regards Uwe Link: https://lore.kernel.org/r/cover.1701619134.git.u.kleine-koenig@pengutronix.de Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
diff --git a/drivers/scsi/a3000.c b/drivers/scsi/a3000.c
@@ -282,7 +282,7 @@ static int __init amiga_a3000_scsi_probe(struct platform_device *pdev)
 	return error;
 }
 
-static int __exit amiga_a3000_scsi_remove(struct platform_device *pdev)
+static void __exit amiga_a3000_scsi_remove(struct platform_device *pdev)
 {
 	struct Scsi_Host *instance = platform_get_drvdata(pdev);
 	struct a3000_hostdata *hdata = shost_priv(instance);
@@ -293,11 +293,10 @@ static int __exit amiga_a3000_scsi_remove(struct platform_device *pdev)
 	free_irq(IRQ_AMIGA_PORTS, instance);
 	scsi_host_put(instance);
 	release_mem_region(res->start, resource_size(res));
-	return 0;
 }
 
 static struct platform_driver amiga_a3000_scsi_driver = {
-	.remove = __exit_p(amiga_a3000_scsi_remove),
+	.remove_new = __exit_p(amiga_a3000_scsi_remove),
 	.driver   = {
 		.name	= "amiga-a3000-scsi",
 	},
diff --git a/drivers/scsi/a4000t.c b/drivers/scsi/a4000t.c
@@ -95,7 +95,7 @@ static int __init amiga_a4000t_scsi_probe(struct platform_device *pdev)
 	return -ENODEV;
 }
 
-static int __exit amiga_a4000t_scsi_remove(struct platform_device *pdev)
+static void __exit amiga_a4000t_scsi_remove(struct platform_device *pdev)
 {
 	struct Scsi_Host *host = platform_get_drvdata(pdev);
 	struct NCR_700_Host_Parameters *hostdata = shost_priv(host);
@@ -106,11 +106,10 @@ static int __exit amiga_a4000t_scsi_remove(struct platform_device *pdev)
 	kfree(hostdata);
 	free_irq(host->irq, host);
 	release_mem_region(res->start, resource_size(res));
-	return 0;
 }
 
 static struct platform_driver amiga_a4000t_scsi_driver = {
-	.remove = __exit_p(amiga_a4000t_scsi_remove),
+	.remove_new = __exit_p(amiga_a4000t_scsi_remove),
 	.driver   = {
 		.name	= "amiga-a4000t-scsi",
 	},
diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c
@@ -865,7 +865,7 @@ static int __init atari_scsi_probe(struct platform_device *pdev)
 	return error;
 }
 
-static int __exit atari_scsi_remove(struct platform_device *pdev)
+static void __exit atari_scsi_remove(struct platform_device *pdev)
 {
 	struct Scsi_Host *instance = platform_get_drvdata(pdev);
 
@@ -876,11 +876,10 @@ static int __exit atari_scsi_remove(struct platform_device *pdev)
 	scsi_host_put(instance);
 	if (atari_dma_buffer)
 		atari_stram_free(atari_dma_buffer);
-	return 0;
 }
 
 static struct platform_driver atari_scsi_driver = {
-	.remove = __exit_p(atari_scsi_remove),
+	.remove_new = __exit_p(atari_scsi_remove),
 	.driver = {
 		.name	= DRV_MODULE_NAME,
 	},
diff --git a/drivers/scsi/bvme6000_scsi.c b/drivers/scsi/bvme6000_scsi.c
@@ -89,7 +89,7 @@ bvme6000_probe(struct platform_device *dev)
 	return -ENODEV;
 }
 
-static int
+static void
 bvme6000_device_remove(struct platform_device *dev)
 {
 	struct Scsi_Host *host = platform_get_drvdata(dev);
@@ -99,16 +99,14 @@ bvme6000_device_remove(struct platform_device *dev)
 	NCR_700_release(host);
 	kfree(hostdata);
 	free_irq(host->irq, host);
-
-	return 0;
 }
 
 static struct platform_driver bvme6000_scsi_driver = {
 	.driver = {
 		.name		= "bvme6000-scsi",
 	},
 	.probe		= bvme6000_probe,
-	.remove		= bvme6000_device_remove,
+	.remove_new	= bvme6000_device_remove,
 };
 
 static int __init bvme6000_scsi_init(void)
diff --git a/drivers/scsi/jazz_esp.c b/drivers/scsi/jazz_esp.c
@@ -176,7 +176,7 @@ static int esp_jazz_probe(struct platform_device *dev)
 	return err;
 }
 
-static int esp_jazz_remove(struct platform_device *dev)
+static void esp_jazz_remove(struct platform_device *dev)
 {
 	struct esp *esp = dev_get_drvdata(&dev->dev);
 	unsigned int irq = esp->host->irq;
@@ -189,16 +189,14 @@ static int esp_jazz_remove(struct platform_device *dev)
 			  esp->command_block_dma);
 
 	scsi_host_put(esp->host);
-
-	return 0;
 }
 
 /* work with hotplug and coldplug */
 MODULE_ALIAS("platform:jazz_esp");
 
 static struct platform_driver esp_jazz_driver = {
 	.probe		= esp_jazz_probe,
-	.remove		= esp_jazz_remove,
+	.remove_new	= esp_jazz_remove,
 	.driver	= {
 		.name	= "jazz_esp",
 	},
diff --git a/drivers/scsi/mac_esp.c b/drivers/scsi/mac_esp.c
@@ -407,7 +407,7 @@ static int esp_mac_probe(struct platform_device *dev)
 	return err;
 }
 
-static int esp_mac_remove(struct platform_device *dev)
+static void esp_mac_remove(struct platform_device *dev)
 {
 	struct mac_esp_priv *mep = platform_get_drvdata(dev);
 	struct esp *esp = mep->esp;
@@ -428,13 +428,11 @@ static int esp_mac_remove(struct platform_device *dev)
 	kfree(esp->command_block);
 
 	scsi_host_put(esp->host);
-
-	return 0;
 }
 
 static struct platform_driver esp_mac_driver = {
 	.probe    = esp_mac_probe,
-	.remove   = esp_mac_remove,
+	.remove_new = esp_mac_remove,
 	.driver   = {
 		.name	= DRV_MODULE_NAME,
 	},
diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c
@@ -523,7 +523,7 @@ static int __init mac_scsi_probe(struct platform_device *pdev)
 	return error;
 }
 
-static int __exit mac_scsi_remove(struct platform_device *pdev)
+static void __exit mac_scsi_remove(struct platform_device *pdev)
 {
 	struct Scsi_Host *instance = platform_get_drvdata(pdev);
 
@@ -532,11 +532,10 @@ static int __exit mac_scsi_remove(struct platform_device *pdev)
 		free_irq(instance->irq, instance);
 	NCR5380_exit(instance);
 	scsi_host_put(instance);
-	return 0;
 }
 
 static struct platform_driver mac_scsi_driver = {
-	.remove = __exit_p(mac_scsi_remove),
+	.remove_new = __exit_p(mac_scsi_remove),
 	.driver = {
 		.name	= DRV_MODULE_NAME,
 	},
diff --git a/drivers/scsi/mvme16x_scsi.c b/drivers/scsi/mvme16x_scsi.c
@@ -103,7 +103,7 @@ static int mvme16x_probe(struct platform_device *dev)
 	return -ENODEV;
 }
 
-static int mvme16x_device_remove(struct platform_device *dev)
+static void mvme16x_device_remove(struct platform_device *dev)
 {
 	struct Scsi_Host *host = platform_get_drvdata(dev);
 	struct NCR_700_Host_Parameters *hostdata = shost_priv(host);
@@ -120,16 +120,14 @@ static int mvme16x_device_remove(struct platform_device *dev)
 	NCR_700_release(host);
 	kfree(hostdata);
 	free_irq(host->irq, host);
-
-	return 0;
 }
 
 static struct platform_driver mvme16x_scsi_driver = {
 	.driver = {
 		.name           = "mvme16x-scsi",
 	},
 	.probe          = mvme16x_probe,
-	.remove         = mvme16x_device_remove,
+	.remove_new     = mvme16x_device_remove,
 };
 
 static int __init mvme16x_scsi_init(void)
diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
@@ -1409,7 +1409,7 @@ static int qpti_sbus_probe(struct platform_device *op)
 	return -ENODEV;
 }
 
-static int qpti_sbus_remove(struct platform_device *op)
+static void qpti_sbus_remove(struct platform_device *op)
 {
 	struct qlogicpti *qpti = dev_get_drvdata(&op->dev);
 
@@ -1438,8 +1438,6 @@ static int qpti_sbus_remove(struct platform_device *op)
 		of_iounmap(&op->resource[0], qpti->sreg, sizeof(unsigned char));
 
 	scsi_host_put(qpti->qhost);
-
-	return 0;
 }
 
 static const struct of_device_id qpti_match[] = {
@@ -1465,7 +1463,7 @@ static struct platform_driver qpti_sbus_driver = {
 		.of_match_table = qpti_match,
 	},
 	.probe		= qpti_sbus_probe,
-	.remove		= qpti_sbus_remove,
+	.remove_new	= qpti_sbus_remove,
 };
 module_platform_driver(qpti_sbus_driver);
 
diff --git a/drivers/scsi/sgiwd93.c b/drivers/scsi/sgiwd93.c
@@ -291,7 +291,7 @@ static int sgiwd93_probe(struct platform_device *pdev)
 	return err;
 }
 
-static int sgiwd93_remove(struct platform_device *pdev)
+static void sgiwd93_remove(struct platform_device *pdev)
 {
 	struct Scsi_Host *host = platform_get_drvdata(pdev);
 	struct ip22_hostdata *hdata = (struct ip22_hostdata *) host->hostdata;
@@ -302,12 +302,11 @@ static int sgiwd93_remove(struct platform_device *pdev)
 	dma_free_noncoherent(&pdev->dev, HPC_DMA_SIZE, hdata->cpu, hdata->dma,
 			DMA_TO_DEVICE);
 	scsi_host_put(host);
-	return 0;
 }
 
 static struct platform_driver sgiwd93_driver = {
 	.probe  = sgiwd93_probe,
-	.remove = sgiwd93_remove,
+	.remove_new = sgiwd93_remove,
 	.driver = {
 		.name   = "sgiwd93",
 	}
diff --git a/drivers/scsi/sni_53c710.c b/drivers/scsi/sni_53c710.c
@@ -104,7 +104,7 @@ static int snirm710_probe(struct platform_device *dev)
 	return -ENODEV;
 }
 
-static int snirm710_driver_remove(struct platform_device *dev)
+static void snirm710_driver_remove(struct platform_device *dev)
 {
 	struct Scsi_Host *host = dev_get_drvdata(&dev->dev);
 	struct NCR_700_Host_Parameters *hostdata =
@@ -115,13 +115,11 @@ static int snirm710_driver_remove(struct platform_device *dev)
 	free_irq(host->irq, host);
 	iounmap(hostdata->base);
 	kfree(hostdata);
-
-	return 0;
 }
 
 static struct platform_driver snirm710_driver = {
 	.probe	= snirm710_probe,
-	.remove	= snirm710_driver_remove,
+	.remove_new = snirm710_driver_remove,
 	.driver	= {
 		.name	= "snirm_53c710",
 	},
diff --git a/drivers/scsi/sun3_scsi.c b/drivers/scsi/sun3_scsi.c
@@ -641,7 +641,7 @@ static int __init sun3_scsi_probe(struct platform_device *pdev)
 	return error;
 }
 
-static int __exit sun3_scsi_remove(struct platform_device *pdev)
+static void __exit sun3_scsi_remove(struct platform_device *pdev)
 {
 	struct Scsi_Host *instance = platform_get_drvdata(pdev);
 	struct NCR5380_hostdata *hostdata = shost_priv(instance);
@@ -654,11 +654,10 @@ static int __exit sun3_scsi_remove(struct platform_device *pdev)
 	if (udc_regs)
 		dvma_free(udc_regs);
 	iounmap(ioaddr);
-	return 0;
 }
 
 static struct platform_driver sun3_scsi_driver = {
-	.remove = __exit_p(sun3_scsi_remove),
+	.remove_new = __exit_p(sun3_scsi_remove),
 	.driver = {
 		.name	= DRV_MODULE_NAME,
 	},
diff --git a/drivers/scsi/sun3x_esp.c b/drivers/scsi/sun3x_esp.c
@@ -243,7 +243,7 @@ static int esp_sun3x_probe(struct platform_device *dev)
 	return err;
 }
 
-static int esp_sun3x_remove(struct platform_device *dev)
+static void esp_sun3x_remove(struct platform_device *dev)
 {
 	struct esp *esp = dev_get_drvdata(&dev->dev);
 	unsigned int irq = esp->host->irq;
@@ -261,13 +261,11 @@ static int esp_sun3x_remove(struct platform_device *dev)
 			  esp->command_block_dma);
 
 	scsi_host_put(esp->host);
-
-	return 0;
 }
 
 static struct platform_driver esp_sun3x_driver = {
 	.probe          = esp_sun3x_probe,
-	.remove         = esp_sun3x_remove,
+	.remove_new     = esp_sun3x_remove,
 	.driver = {
 		.name   = "sun3x_esp",
 	},
diff --git a/drivers/scsi/sun_esp.c b/drivers/scsi/sun_esp.c
@@ -550,7 +550,7 @@ static int esp_sbus_probe(struct platform_device *op)
 	return ret;
 }
 
-static int esp_sbus_remove(struct platform_device *op)
+static void esp_sbus_remove(struct platform_device *op)
 {
 	struct esp *esp = dev_get_drvdata(&op->dev);
 	struct platform_device *dma_of = esp->dma;
@@ -581,8 +581,6 @@ static int esp_sbus_remove(struct platform_device *op)
 	dev_set_drvdata(&op->dev, NULL);
 
 	put_device(&dma_of->dev);
-
-	return 0;
 }
 
 static const struct of_device_id esp_match[] = {
@@ -605,7 +603,7 @@ static struct platform_driver esp_sbus_driver = {
 		.of_match_table = esp_match,
 	},
 	.probe		= esp_sbus_probe,
-	.remove		= esp_sbus_remove,
+	.remove_new	= esp_sbus_remove,
 };
 module_platform_driver(esp_sbus_driver);
 

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ static int __init amiga_a3000_scsi_probe(struct platform_device *pdev)`
`282`	`282`	`return error;`
`283`	`283`	`}`
`284`	`284`
`285`		`-static int __exit amiga_a3000_scsi_remove(struct platform_device *pdev)`
	`285`	`+static void __exit amiga_a3000_scsi_remove(struct platform_device *pdev)`
`286`	`286`	`{`
`287`	`287`	`struct Scsi_Host *instance = platform_get_drvdata(pdev);`
`288`	`288`	`struct a3000_hostdata *hdata = shost_priv(instance);`
`@@ -293,11 +293,10 @@ static int __exit amiga_a3000_scsi_remove(struct platform_device *pdev)`
`293`	`293`	`free_irq(IRQ_AMIGA_PORTS, instance);`
`294`	`294`	`scsi_host_put(instance);`
`295`	`295`	`release_mem_region(res->start, resource_size(res));`
`296`		`- return 0;`
`297`	`296`	`}`
`298`	`297`
`299`	`298`	`static struct platform_driver amiga_a3000_scsi_driver = {`
`300`		`- .remove = __exit_p(amiga_a3000_scsi_remove),`
	`299`	`+ .remove_new = __exit_p(amiga_a3000_scsi_remove),`
`301`	`300`	`.driver = {`
`302`	`301`	`.name = "amiga-a3000-scsi",`
`303`	`302`	`},`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ static int __init amiga_a4000t_scsi_probe(struct platform_device *pdev)`
`95`	`95`	`return -ENODEV;`
`96`	`96`	`}`
`97`	`97`
`98`		`-static int __exit amiga_a4000t_scsi_remove(struct platform_device *pdev)`
	`98`	`+static void __exit amiga_a4000t_scsi_remove(struct platform_device *pdev)`
`99`	`99`	`{`
`100`	`100`	`struct Scsi_Host *host = platform_get_drvdata(pdev);`
`101`	`101`	`struct NCR_700_Host_Parameters *hostdata = shost_priv(host);`
`@@ -106,11 +106,10 @@ static int __exit amiga_a4000t_scsi_remove(struct platform_device *pdev)`
`106`	`106`	`kfree(hostdata);`
`107`	`107`	`free_irq(host->irq, host);`
`108`	`108`	`release_mem_region(res->start, resource_size(res));`
`109`		`- return 0;`
`110`	`109`	`}`
`111`	`110`
`112`	`111`	`static struct platform_driver amiga_a4000t_scsi_driver = {`
`113`		`- .remove = __exit_p(amiga_a4000t_scsi_remove),`
	`112`	`+ .remove_new = __exit_p(amiga_a4000t_scsi_remove),`
`114`	`113`	`.driver = {`
`115`	`114`	`.name = "amiga-a4000t-scsi",`
`116`	`115`	`},`
Original file line number	Diff line number	Diff line change
`@@ -865,7 +865,7 @@ static int __init atari_scsi_probe(struct platform_device *pdev)`
`865`	`865`	`return error;`
`866`	`866`	`}`
`867`	`867`
`868`		`-static int __exit atari_scsi_remove(struct platform_device *pdev)`
	`868`	`+static void __exit atari_scsi_remove(struct platform_device *pdev)`
`869`	`869`	`{`
`870`	`870`	`struct Scsi_Host *instance = platform_get_drvdata(pdev);`
`871`	`871`
`@@ -876,11 +876,10 @@ static int __exit atari_scsi_remove(struct platform_device *pdev)`
`876`	`876`	`scsi_host_put(instance);`
`877`	`877`	`if (atari_dma_buffer)`
`878`	`878`	`atari_stram_free(atari_dma_buffer);`
`879`		`- return 0;`
`880`	`879`	`}`
`881`	`880`
`882`	`881`	`static struct platform_driver atari_scsi_driver = {`
`883`		`- .remove = __exit_p(atari_scsi_remove),`
	`882`	`+ .remove_new = __exit_p(atari_scsi_remove),`
`884`	`883`	`.driver = {`
`885`	`884`	`.name = DRV_MODULE_NAME,`
`886`	`885`	`},`
Original file line number	Diff line number	Diff line change
`@@ -523,7 +523,7 @@ static int __init mac_scsi_probe(struct platform_device *pdev)`
`523`	`523`	`return error;`
`524`	`524`	`}`
`525`	`525`
`526`		`-static int __exit mac_scsi_remove(struct platform_device *pdev)`
	`526`	`+static void __exit mac_scsi_remove(struct platform_device *pdev)`
`527`	`527`	`{`
`528`	`528`	`struct Scsi_Host *instance = platform_get_drvdata(pdev);`
`529`	`529`
`@@ -532,11 +532,10 @@ static int __exit mac_scsi_remove(struct platform_device *pdev)`
`532`	`532`	`free_irq(instance->irq, instance);`
`533`	`533`	`NCR5380_exit(instance);`
`534`	`534`	`scsi_host_put(instance);`
`535`		`- return 0;`
`536`	`535`	`}`
`537`	`536`
`538`	`537`	`static struct platform_driver mac_scsi_driver = {`
`539`		`- .remove = __exit_p(mac_scsi_remove),`
	`538`	`+ .remove_new = __exit_p(mac_scsi_remove),`
`540`	`539`	`.driver = {`
`541`	`540`	`.name = DRV_MODULE_NAME,`
`542`	`541`	`},`
Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ static int sgiwd93_probe(struct platform_device *pdev)`
`291`	`291`	`return err;`
`292`	`292`	`}`
`293`	`293`
`294`		`-static int sgiwd93_remove(struct platform_device *pdev)`
	`294`	`+static void sgiwd93_remove(struct platform_device *pdev)`
`295`	`295`	`{`
`296`	`296`	`struct Scsi_Host *host = platform_get_drvdata(pdev);`
`297`	`297`	`struct ip22_hostdata hdata = (struct ip22_hostdata ) host->hostdata;`
`@@ -302,12 +302,11 @@ static int sgiwd93_remove(struct platform_device *pdev)`
`302`	`302`	`dma_free_noncoherent(&pdev->dev, HPC_DMA_SIZE, hdata->cpu, hdata->dma,`
`303`	`303`	`DMA_TO_DEVICE);`
`304`	`304`	`scsi_host_put(host);`
`305`		`- return 0;`
`306`	`305`	`}`
`307`	`306`
`308`	`307`	`static struct platform_driver sgiwd93_driver = {`
`309`	`308`	`.probe = sgiwd93_probe,`
`310`		`- .remove = sgiwd93_remove,`
	`309`	`+ .remove_new = sgiwd93_remove,`
`311`	`310`	`.driver = {`
`312`	`311`	`.name = "sgiwd93",`
`313`	`312`	`}`