]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[SCSI] sgiwd93: Fix compilation warning
authorDmitri Vorobiev <dmitri.vorobiev@movial.fi>
Tue, 16 Dec 2008 13:04:44 +0000 (15:04 +0200)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Fri, 2 Jan 2009 16:58:41 +0000 (10:58 -0600)
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>
drivers/scsi/sgiwd93.c

index 31fe6051c799869f76713ffa674d4d795baf73dc..0807b260268b390393416ebbf4a811eb64e3443c 100644 (file)
@@ -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 = {