Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b99b4c67 authored by Dmitri Vorobiev's avatar Dmitri Vorobiev Committed by James Bottomley
Browse files

[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: default avatarDmitri Vorobiev <dmitri.vorobiev@movial.fi>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 752b3232

drivers/scsi/sgiwd93.c

+2 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ static int __init sgiwd93_probe(struct platform_device *pdev) 
	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 = {