1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
From 83d4d74caed0073bfc16a61e8ad604f64801e6ba Mon Sep 17 00:00:00 2001
From: Andy Green <agreen@localhost.localdomain>
Date: Fri, 25 Jul 2008 23:06:07 +0100
Subject: [PATCH] clean-sdio-hcd-suspend.patch
fix trailing whitespace and function args for suspend.
Signed-off-by: Andy Green <andy@openmoko.com>
---
drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
index fdc69a0..edb8523 100644
--- a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
+++ b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
@@ -1365,11 +1365,11 @@ static int s3c24xx_hcd_remove(struct platform_device * pdev) {
return 0;
}
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM
-static int s3c24xx_hcd_suspend(struct platform_device * pdev)
+static int s3c24xx_hcd_suspend(struct platform_device * pdev, pm_message_t state)
{
- struct s3c24xx_hcd_context * context = &hcd_context;
+ struct s3c24xx_hcd_context * context = &hcd_context;
unsigned long flags;
spin_lock_irqsave(&context->lock, flags);
@@ -1390,18 +1390,18 @@ static int s3c24xx_hcd_suspend(struct platform_device * pdev)
context->suspend_regs.datsta = readl(context->base + S3C2410_SDIDSTA);
context->suspend_regs.fsta = readl(context->base + S3C2410_SDIFSTA);
context->suspend_regs.imask = readl(context->base + S3C2440_SDIIMSK);
-
+
spin_unlock_irqrestore(&context->lock, flags);
return 0;
}
static int s3c24xx_hcd_resume(struct platform_device * pdev)
-{
+{
struct s3c24xx_hcd_context * context = &hcd_context;
unsigned long flags;
spin_lock_irqsave(&context->lock, flags);
-
+
writel(context->suspend_regs.con, context->base + S3C2410_SDICON);
writel(context->suspend_regs.pre, context->base + S3C2410_SDIPRE);
writel(context->suspend_regs.cmdarg, context->base + S3C2410_SDICMDARG);
--
1.5.6.3
|
