openwrt-owl/target/linux/s3c24xx/patches-2.6.24/1139-clean-sdio-hcd-suspend...

57 lines
1.9 KiB
Diff
Raw Normal View History

From 401eb535cb94e53ba4ff1a04caafe96b7d4d1981 Mon Sep 17 00:00:00 2001
From: Andy Green <agreen@localhost.localdomain>
Date: Wed, 30 Apr 2008 13:34:14 +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 7ead7b7..1292020 100644
--- a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
+++ b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
@@ -1364,11 +1364,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);
@@ -1389,18 +1389,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.5