46 lines
1.2 KiB
Diff
46 lines
1.2 KiB
Diff
|
From 8f30eb1354f54684d1d09599b2466f1a0e69d9c3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Gabor Juhos <juhosg@openwrt.org>
|
||
|
|
Date: Wed, 11 Jan 2012 22:19:32 +0100
|
||
|
|
Subject: [PATCH 46/47] spi/ath79: add shutdown handler
|
||
|
|
|
||
|
|
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||
|
|
---
|
||
|
|
drivers/spi/spi-ath79.c | 12 +++++++++++-
|
||
|
|
1 files changed, 11 insertions(+), 1 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/spi/spi-ath79.c
|
||
|
|
+++ b/drivers/spi/spi-ath79.c
|
||
|
|
@@ -296,7 +296,7 @@ err_put_master:
|
||
|
|
return ret;
|
||
|
|
}
|
||
|
|
|
||
|
|
-static __devexit int ath79_spi_remove(struct platform_device *pdev)
|
||
|
|
+static void __ath79_spi_remove(struct platform_device *pdev)
|
||
|
|
{
|
||
|
|
struct ath79_spi *sp = platform_get_drvdata(pdev);
|
||
|
|
|
||
|
|
@@ -307,13 +307,23 @@ static __devexit int ath79_spi_remove(st
|
||
|
|
iounmap(sp->base);
|
||
|
|
platform_set_drvdata(pdev, NULL);
|
||
|
|
spi_master_put(sp->bitbang.master);
|
||
|
|
+}
|
||
|
|
|
||
|
|
+static __devexit int ath79_spi_remove(struct platform_device *pdev)
|
||
|
|
+{
|
||
|
|
+ __ath79_spi_remove(pdev);
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
+static void ath79_spi_shutdown(struct platform_device *pdev)
|
||
|
|
+{
|
||
|
|
+ __ath79_spi_remove(pdev);
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
static struct platform_driver ath79_spi_driver = {
|
||
|
|
.probe = ath79_spi_probe,
|
||
|
|
.remove = __devexit_p(ath79_spi_remove),
|
||
|
|
+ .shutdown = ath79_spi_shutdown,
|
||
|
|
.driver = {
|
||
|
|
.name = DRV_NAME,
|
||
|
|
.owner = THIS_MODULE,
|