Merge remote-tracking branches 'spi/topic/omap-uwire', 'spi/topic/omap100k', 'spi...

[uclinux-h8/linux.git] / drivers / spi / spi-omap-uwire.c

diff --git a/drivers/spi/spi-omap-uwire.c b/drivers/spi/spi-omap-uwire.c
index 31ce92f..be2a2e1 100644 (file)
--- a/drivers/spi/spi-omap-uwire.c
+++ b/drivers/spi/spi-omap-uwire.c
@@ -516,14 +516,13 @@ static int uwire_probe(struct platform_device *pdev)
 static int uwire_remove(struct platform_device *pdev)
 {
        struct uwire_spi        *uwire = platform_get_drvdata(pdev);
-       int                     status;
 
        // FIXME remove all child devices, somewhere ...
 
-       status = spi_bitbang_stop(&uwire->bitbang);
+       spi_bitbang_stop(&uwire->bitbang);
        uwire_off(uwire);
        iounmap(uwire_base);
-       return status;
+       return 0;
 }
 
 /* work with hotplug and coldplug */