From patchwork Mon Jul 11 06:17:26 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chuanxiao.Dong" X-Patchwork-Id: 963422 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6B6TGoi015497 for ; Mon, 11 Jul 2011 06:29:17 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757143Ab1GKG3P (ORCPT ); Mon, 11 Jul 2011 02:29:15 -0400 Received: from mga02.intel.com ([134.134.136.20]:59242 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756347Ab1GKG3P (ORCPT ); Mon, 11 Jul 2011 02:29:15 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 10 Jul 2011 23:29:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.65,513,1304319600"; d="scan'208";a="24306659" Received: from unknown (HELO intel.com) ([172.16.120.122]) by orsmga002.jf.intel.com with ESMTP; 10 Jul 2011 23:29:13 -0700 Date: Mon, 11 Jul 2011 14:17:26 +0800 From: Chuanxiao Dong To: linux-mmc@vger.kernel.org, linux-pm@lists.linux-foundation.org Cc: ohad@wizery.com Subject: [PATCH]mmc: remove MMC bus legacy suspend/resume method Message-ID: <20110711061726.GA19185@intel.com> Reply-To: Chuanxiao Dong MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-12-10) Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 11 Jul 2011 06:29:17 +0000 (UTC) MMC bus suspend/resume was using legacy method. In system entering S3 patch, the suspend/resume function cannot be called since MMC bus also implemented the new suspend/resume method (dev_pm_ops struct). So if dev_pm_ops is defined but .suspend/.resume callbacks not implemented, mmc_queue will not be suspended/resumed. This patch will remove the legacy suspend/resume method and change to use the new method totally. Signed-off-by: Chuanxiao Dong --- drivers/mmc/card/block.c | 2 +- drivers/mmc/core/bus.c | 24 +++++++++++------------- include/linux/mmc/card.h | 2 +- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 38d0149..224f1bb 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1549,7 +1549,7 @@ static void mmc_blk_remove(struct mmc_card *card) } #ifdef CONFIG_PM -static int mmc_blk_suspend(struct mmc_card *card, pm_message_t state) +static int mmc_blk_suspend(struct mmc_card *card) { struct mmc_blk_data *part_md; struct mmc_blk_data *md = mmc_get_drvdata(card); diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c index 393d817..03be6d0 100644 --- a/drivers/mmc/core/bus.c +++ b/drivers/mmc/core/bus.c @@ -120,14 +120,14 @@ static int mmc_bus_remove(struct device *dev) return 0; } -static int mmc_bus_suspend(struct device *dev, pm_message_t state) +static int mmc_bus_suspend(struct device *dev) { struct mmc_driver *drv = to_mmc_driver(dev->driver); struct mmc_card *card = mmc_dev_to_card(dev); int ret = 0; if (dev->driver && drv->suspend) - ret = drv->suspend(card, state); + ret = drv->suspend(card); return ret; } @@ -163,20 +163,20 @@ static int mmc_runtime_idle(struct device *dev) return pm_runtime_suspend(dev); } +#else /* !CONFIG_PM_RUNTIME */ +#define mmc_runtime_suspend NULL +#define mmc_runtime_resume NULL +#define mmc_runtime_idle NULL +#endif /* !CONFIG_PM_RUNTIME */ + static const struct dev_pm_ops mmc_bus_pm_ops = { .runtime_suspend = mmc_runtime_suspend, .runtime_resume = mmc_runtime_resume, .runtime_idle = mmc_runtime_idle, + .suspend = mmc_bus_suspend, + .resume = mmc_bus_resume, }; -#define MMC_PM_OPS_PTR (&mmc_bus_pm_ops) - -#else /* !CONFIG_PM_RUNTIME */ - -#define MMC_PM_OPS_PTR NULL - -#endif /* !CONFIG_PM_RUNTIME */ - static struct bus_type mmc_bus_type = { .name = "mmc", .dev_attrs = mmc_dev_attrs, @@ -184,9 +184,7 @@ static struct bus_type mmc_bus_type = { .uevent = mmc_bus_uevent, .probe = mmc_bus_probe, .remove = mmc_bus_remove, - .suspend = mmc_bus_suspend, - .resume = mmc_bus_resume, - .pm = MMC_PM_OPS_PTR, + .pm = &mmc_bus_pm_ops, }; int mmc_register_bus(void) diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index b460fc2..978f395 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -393,7 +393,7 @@ struct mmc_driver { struct device_driver drv; int (*probe)(struct mmc_card *); void (*remove)(struct mmc_card *); - int (*suspend)(struct mmc_card *, pm_message_t); + int (*suspend)(struct mmc_card *); int (*resume)(struct mmc_card *); };