提交 b99b4c67 编写于 作者: D Dmitri Vorobiev 提交者: James Bottomley

[SCSI] sgiwd93: Fix compilation warning

The remove() callback in platform drivers should return int in
accordance to the definition of the platform_driver structure.
However, the SGI-specific WD93 SCSI controller driver defines
the callback as a void function, which causes the following
compilation warning:

drivers/scsi/sgiwd93.c:314: warning: initialization from
incompatible pointer type

This patch fixes the warning by changing the return type of
the remove() callback to what the core driver code requires.
Signed-off-by: NDmitri Vorobiev <dmitri.vorobiev@movial.fi>
Signed-off-by: NJames Bottomley <James.Bottomley@HansenPartnership.com>
上级 752b3232
...@@ -297,7 +297,7 @@ static int __init sgiwd93_probe(struct platform_device *pdev) ...@@ -297,7 +297,7 @@ static int __init sgiwd93_probe(struct platform_device *pdev)
return err; return err;
} }
static void __exit sgiwd93_remove(struct platform_device *pdev) static int __exit sgiwd93_remove(struct platform_device *pdev)
{ {
struct Scsi_Host *host = platform_get_drvdata(pdev); struct Scsi_Host *host = platform_get_drvdata(pdev);
struct ip22_hostdata *hdata = (struct ip22_hostdata *) host->hostdata; struct ip22_hostdata *hdata = (struct ip22_hostdata *) host->hostdata;
...@@ -307,6 +307,7 @@ static void __exit sgiwd93_remove(struct platform_device *pdev) ...@@ -307,6 +307,7 @@ static void __exit sgiwd93_remove(struct platform_device *pdev)
free_irq(pd->irq, host); free_irq(pd->irq, host);
dma_free_noncoherent(&pdev->dev, HPC_DMA_SIZE, hdata->cpu, hdata->dma); dma_free_noncoherent(&pdev->dev, HPC_DMA_SIZE, hdata->cpu, hdata->dma);
scsi_host_put(host); scsi_host_put(host);
return 0;
} }
static struct platform_driver sgiwd93_driver = { static struct platform_driver sgiwd93_driver = {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册