Commit e78e59ac authored by Martin K. Petersen's avatar Martin K. Petersen
Browse files

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

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 5c5a7680 ("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: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parents e84d3437 6ff482ee

drivers/scsi/a3000.c

+2 −3
Original line number Diff line number Diff line
@@ -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",

	},

drivers/scsi/a4000t.c

+2 −3
Original line number Diff line number Diff line
@@ -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",

	},

drivers/scsi/atari_scsi.c

+2 −3
Original line number Diff line number Diff line
@@ -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,

	},

drivers/scsi/bvme6000_scsi.c

+2 −4
Original line number Diff line number Diff line
@@ -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,8 +99,6 @@ 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 = {
@@ -108,7 +106,7 @@ static struct platform_driver bvme6000_scsi_driver = { 
		.name		= "bvme6000-scsi",

	},

	.probe		= bvme6000_probe,

	.remove		= bvme6000_device_remove,

	.remove_new	= bvme6000_device_remove,

};



static int __init bvme6000_scsi_init(void)

drivers/scsi/jazz_esp.c

+2 −4
Original line number Diff line number Diff line
@@ -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,8 +189,6 @@ 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 */
@@ -198,7 +196,7 @@ 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",

	},