From 1571fdab597ba4415608180020e18944c3963101 Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Thu, 9 Aug 2012 09:32:21 +0000 Subject: [PATCH] --- yaml --- r: 332823 b: refs/heads/master c: d8e2ac330f65bcf47e8894fe5331a7e8ee019c06 h: refs/heads/master i: 332821: a8eb120b362c46090a3aa48f58913c40b03c48bf 332819: aa954afbb0691c6e75ea47b087e0098525fa00d0 332815: e3e63f3e29882c7190dfd154ed90ec231e43546f v: v3 --- [refs] | 2 +- trunk/drivers/mmc/core/sdio_bus.c | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 458d9a7b4907..de30eb803cd4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a41313e7f8c5b724a2e3ff66558dbe811844423 +refs/heads/master: d8e2ac330f65bcf47e8894fe5331a7e8ee019c06 diff --git a/trunk/drivers/mmc/core/sdio_bus.c b/trunk/drivers/mmc/core/sdio_bus.c index 236842ec955a..6bf68799fe97 100644 --- a/trunk/drivers/mmc/core/sdio_bus.c +++ b/trunk/drivers/mmc/core/sdio_bus.c @@ -193,14 +193,7 @@ static int sdio_bus_remove(struct device *dev) } #ifdef CONFIG_PM - -static int pm_no_operation(struct device *dev) -{ - return 0; -} - static const struct dev_pm_ops sdio_bus_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(pm_no_operation, pm_no_operation) SET_RUNTIME_PM_OPS( pm_generic_runtime_suspend, pm_generic_runtime_resume,