projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
drivers
/
mmc
/
host
/
jz4740_mmc.c
diff --git
a/drivers/mmc/host/jz4740_mmc.c
b/drivers/mmc/host/jz4740_mmc.c
index c8852a8128a90c119d7d53c5eec5381aa9678008..2391c6b7a4bb7ce2629d4bf74c7e70b615560392 100644
(file)
--- a/
drivers/mmc/host/jz4740_mmc.c
+++ b/
drivers/mmc/host/jz4740_mmc.c
@@
-702,7
+702,7
@@
static const struct jz_gpio_bulk_request jz4740_mmc_pins[] = {
JZ_GPIO_BULK_PIN(MSC_DATA3),
};
JZ_GPIO_BULK_PIN(MSC_DATA3),
};
-static int
__devinit
jz4740_mmc_request_gpio(struct device *dev, int gpio,
+static int jz4740_mmc_request_gpio(struct device *dev, int gpio,
const char *name, bool output, int value)
{
int ret;
const char *name, bool output, int value)
{
int ret;
@@
-724,7
+724,7
@@
static int __devinit jz4740_mmc_request_gpio(struct device *dev, int gpio,
return 0;
}
return 0;
}
-static int
__devinit
jz4740_mmc_request_gpios(struct platform_device *pdev)
+static int jz4740_mmc_request_gpios(struct platform_device *pdev)
{
int ret;
struct jz4740_mmc_platform_data *pdata = pdev->dev.platform_data;
{
int ret;
struct jz4740_mmc_platform_data *pdata = pdev->dev.platform_data;
@@
-759,7
+759,7
@@
err:
return ret;
}
return ret;
}
-static int
__devinit
jz4740_mmc_request_cd_irq(struct platform_device *pdev,
+static int jz4740_mmc_request_cd_irq(struct platform_device *pdev,
struct jz4740_mmc_host *host)
{
struct jz4740_mmc_platform_data *pdata = pdev->dev.platform_data;
struct jz4740_mmc_host *host)
{
struct jz4740_mmc_platform_data *pdata = pdev->dev.platform_data;
@@
-802,7
+802,7
@@
static inline size_t jz4740_mmc_num_pins(struct jz4740_mmc_host *host)
return num_pins;
}
return num_pins;
}
-static int
__devinit
jz4740_mmc_probe(struct platform_device* pdev)
+static int jz4740_mmc_probe(struct platform_device* pdev)
{
int ret;
struct mmc_host *mmc;
{
int ret;
struct mmc_host *mmc;
@@
-938,7
+938,7
@@
err_free_host:
return ret;
}
return ret;
}
-static int
__devexit
jz4740_mmc_remove(struct platform_device *pdev)
+static int jz4740_mmc_remove(struct platform_device *pdev)
{
struct jz4740_mmc_host *host = platform_get_drvdata(pdev);
{
struct jz4740_mmc_host *host = platform_get_drvdata(pdev);
@@
-1004,7
+1004,7
@@
const struct dev_pm_ops jz4740_mmc_pm_ops = {
static struct platform_driver jz4740_mmc_driver = {
.probe = jz4740_mmc_probe,
static struct platform_driver jz4740_mmc_driver = {
.probe = jz4740_mmc_probe,
- .remove =
__devexit_p(jz4740_mmc_remove)
,
+ .remove =
jz4740_mmc_remove
,
.driver = {
.name = "jz4740-mmc",
.owner = THIS_MODULE,
.driver = {
.name = "jz4740-mmc",
.owner = THIS_MODULE,