diff options
author | Dmitri Vorobiev <dmitri.vorobiev@movial.fi> | 2008-12-16 08:04:44 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-01-02 11:58:41 -0500 |
commit | b99b4c67db9b6dde67955b3746666505a48ec7ee (patch) | |
tree | 3b6b53f6ac2dd3bc09b392fc1f1ed57722409bd3 /drivers | |
parent | 752b32329b48e0b7481e82a5f891aa5bf01f3782 (diff) |
[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: Dmitri Vorobiev <dmitri.vorobiev@movial.fi>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/scsi/sgiwd93.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/sgiwd93.c b/drivers/scsi/sgiwd93.c index 31fe6051c799..0807b260268b 100644 --- a/drivers/scsi/sgiwd93.c +++ b/drivers/scsi/sgiwd93.c | |||
@@ -297,7 +297,7 @@ out: | |||
297 | return err; | 297 | return err; |
298 | } | 298 | } |
299 | 299 | ||
300 | static void __exit sgiwd93_remove(struct platform_device *pdev) | 300 | static int __exit sgiwd93_remove(struct platform_device *pdev) |
301 | { | 301 | { |
302 | struct Scsi_Host *host = platform_get_drvdata(pdev); | 302 | struct Scsi_Host *host = platform_get_drvdata(pdev); |
303 | struct ip22_hostdata *hdata = (struct ip22_hostdata *) host->hostdata; | 303 | struct ip22_hostdata *hdata = (struct ip22_hostdata *) host->hostdata; |
@@ -307,6 +307,7 @@ static void __exit sgiwd93_remove(struct platform_device *pdev) | |||
307 | free_irq(pd->irq, host); | 307 | free_irq(pd->irq, host); |
308 | dma_free_noncoherent(&pdev->dev, HPC_DMA_SIZE, hdata->cpu, hdata->dma); | 308 | dma_free_noncoherent(&pdev->dev, HPC_DMA_SIZE, hdata->cpu, hdata->dma); |
309 | scsi_host_put(host); | 309 | scsi_host_put(host); |
310 | return 0; | ||
310 | } | 311 | } |
311 | 312 | ||
312 | static struct platform_driver sgiwd93_driver = { | 313 | static struct platform_driver sgiwd93_driver = { |