target/linux/s3c24xx/patches-2.6.26/0131-clean-sdio-hcd-suspend.patch.patch

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