Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 332833
b: refs/heads/master
c: 17403f2
h: refs/heads/master
i:
  332831: f473a05
v: v3
  • Loading branch information
Thomas Abraham authored and Chris Ball committed Oct 3, 2012
1 parent d6a738a commit d2bf620
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c91eab4b2564f2424268113ab348eacf9381c2d9
refs/heads/master: 17403f235e94dcccf95b43138b197c4de2ab6816
12 changes: 10 additions & 2 deletions trunk/drivers/mmc/host/dw_mmc-pltfm.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#include "dw_mmc.h"

static int __devinit dw_mci_pltfm_probe(struct platform_device *pdev)
int dw_mci_pltfm_register(struct platform_device *pdev)
{
struct dw_mci *host;
struct resource *regs;
Expand Down Expand Up @@ -52,6 +52,12 @@ static int __devinit dw_mci_pltfm_probe(struct platform_device *pdev)
ret = dw_mci_probe(host);
return ret;
}
EXPORT_SYMBOL_GPL(dw_mci_pltfm_register);

static int __devinit dw_mci_pltfm_probe(struct platform_device *pdev)
{
return dw_mci_pltfm_register(pdev);
}

static int __devexit dw_mci_pltfm_remove(struct platform_device *pdev)
{
Expand All @@ -61,6 +67,7 @@ static int __devexit dw_mci_pltfm_remove(struct platform_device *pdev)
dw_mci_remove(host);
return 0;
}
EXPORT_SYMBOL_GPL(dw_mci_pltfm_remove);

#ifdef CONFIG_PM_SLEEP
/*
Expand Down Expand Up @@ -94,7 +101,8 @@ static int dw_mci_pltfm_resume(struct device *dev)
#define dw_mci_pltfm_resume NULL
#endif /* CONFIG_PM_SLEEP */

static SIMPLE_DEV_PM_OPS(dw_mci_pltfm_pmops, dw_mci_pltfm_suspend, dw_mci_pltfm_resume);
SIMPLE_DEV_PM_OPS(dw_mci_pltfm_pmops, dw_mci_pltfm_suspend, dw_mci_pltfm_resume);
EXPORT_SYMBOL_GPL(dw_mci_pltfm_pmops);

static const struct of_device_id dw_mci_pltfm_match[] = {
{ .compatible = "snps,dw-mshc", },
Expand Down
19 changes: 19 additions & 0 deletions trunk/drivers/mmc/host/dw_mmc-pltfm.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/*
* Synopsys DesignWare Multimedia Card Interface Platform driver
*
* Copyright (C) 2012, Samsung Electronics Co., Ltd.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*/

#ifndef _DW_MMC_PLTFM_H_
#define _DW_MMC_PLTFM_H_

extern int dw_mci_pltfm_register(struct platform_device *pdev);
extern int __devexit dw_mci_pltfm_remove(struct platform_device *pdev);
extern const struct dev_pm_ops dw_mci_pltfm_pmops;

#endif /* _DW_MMC_PLTFM_H_ */

0 comments on commit d2bf620

Please sign in to comment.