diff options
| author | Dmitri Vorobiev <dmitri.vorobiev@movial.fi> | 2008-12-16 15:04:44 +0200 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-01-02 10:58:41 -0600 |
| commit | b99b4c67db9b6dde67955b3746666505a48ec7ee (patch) | |
| tree | 3b6b53f6ac2dd3bc09b392fc1f1ed57722409bd3 | |
| parent | 752b32329b48e0b7481e82a5f891aa5bf01f3782 (diff) | |
| download | lwn-b99b4c67db9b6dde67955b3746666505a48ec7ee.tar.gz lwn-b99b4c67db9b6dde67955b3746666505a48ec7ee.zip | |
[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>
| -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: 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 ip22_hostdata *hdata = (struct ip22_hostdata *) host->hostdata; @@ -307,6 +307,7 @@ static void __exit sgiwd93_remove(struct platform_device *pdev) free_irq(pd->irq, host); dma_free_noncoherent(&pdev->dev, HPC_DMA_SIZE, hdata->cpu, hdata->dma); scsi_host_put(host); + return 0; } static struct platform_driver sgiwd93_driver = { |