From patchwork Mon May 7 13:41:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Girish K S X-Patchwork-Id: 8433 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id F0F9E23E20 for ; Mon, 7 May 2012 13:41:46 +0000 (UTC) Received: from mail-gy0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id BFEF4A186EE for ; Mon, 7 May 2012 13:41:46 +0000 (UTC) Received: by mail-gy0-f180.google.com with SMTP id z12so2183403ghb.11 for ; Mon, 07 May 2012 06:41:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=N2MDOPmKOjUMurXBAO4LDeXYUVpMBuusmanzBxTKecQ=; b=eIIQkrlHWUY8AKlCe5u3Z4STEx/k1heXjF1zwbjtTrGheerWBkn/bF/qPTe8/W3OnS aclkHANdDbqCLQjQyPtwobJsxnBLsWJzXabTOG0U8FeaaYEacb2kGt5hwEIWbKo3sxp/ 4izwXInwsE8odS8xiMryRZ72I2c7davm8Q/6vRdd0lHTC+uHu/lFfjRKb8mHP7BfskXt kBtL/tQh/5UU9vXfFh4RZghAdhp4JOGI3iZEYl0pDXrq1AotXmei1lW1548xcsyxrZpG LgOBRioUZtjDJPWDYL4xV3VAmid2SWB4boNtHvNeIU6DDU9EOQ8/QeLfaWQEkUFb/hFo oRPQ== Received: by 10.50.10.225 with SMTP id l1mr8461990igb.1.1336398106351; Mon, 07 May 2012 06:41:46 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.73.147 with SMTP id q19csp126900ibj; Mon, 7 May 2012 06:41:45 -0700 (PDT) Received: by 10.68.130.67 with SMTP id oc3mr23922119pbb.68.1336398105716; Mon, 07 May 2012 06:41:45 -0700 (PDT) Received: from mail-pb0-f50.google.com (mail-pb0-f50.google.com [209.85.160.50]) by mx.google.com with ESMTPS id l3si18169501pbs.184.2012.05.07.06.41.45 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 07 May 2012 06:41:45 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of girish.shivananjappa@linaro.org) client-ip=209.85.160.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of girish.shivananjappa@linaro.org) smtp.mail=girish.shivananjappa@linaro.org Received: by mail-pb0-f50.google.com with SMTP id rr4so8086909pbb.37 for ; Mon, 07 May 2012 06:41:45 -0700 (PDT) Received: by 10.68.228.132 with SMTP id si4mr23105196pbc.86.1336398105473; Mon, 07 May 2012 06:41:45 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id x1sm18357021pbp.50.2012.05.07.06.41.42 (version=SSLv3 cipher=OTHER); Mon, 07 May 2012 06:41:44 -0700 (PDT) From: Girish K S To: linux-mmc@vger.kernel.org Cc: patches@linaro.org, ulf.hansson@stericsson.com, saugata.das@linaro.org, girish.shivananjappa@linaro.org Subject: [PATCH v3 2/2] mmc4.5: host: poweroff notify rework Date: Mon, 7 May 2012 19:11:24 +0530 Message-Id: <1336398084-23203-2-git-send-email-girish.shivananjappa@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1336398084-23203-1-git-send-email-girish.shivananjappa@linaro.org> References: <1336398084-23203-1-git-send-email-girish.shivananjappa@linaro.org> X-Gm-Message-State: ALoCoQlji4Yzdn0kLHpnUdoxtjKvTqszrywbq5rVLcxSliaVkWBvE8yvEXXGSBChj2N5y9HDsSsA This patch changes the structure member name to maintain consistency of name for the poweroff notify feature Signed-off-by: Girish K S --- drivers/mmc/host/dw_mmc.c | 4 ++-- drivers/mmc/host/sdhci.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index ab3fc46..09ac734 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1791,9 +1791,9 @@ static int __init dw_mci_init_slot(struct dw_mci *host, unsigned int id) mmc->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED; if (mmc->caps2 & MMC_CAP2_POWEROFF_NOTIFY) - mmc->power_notify_type = MMC_HOST_PW_NOTIFY_SHORT; + mmc->poweroff_notify_type = MMC_HOST_PW_OFF_NOTIFY_SHORT; else - mmc->power_notify_type = MMC_HOST_PW_NOTIFY_NONE; + mmc->poweroff_notify_type = MMC_HOST_PW_OFF_NOTIFY_NONE; if (host->pdata->blk_settings) { mmc->max_segs = host->pdata->blk_settings->max_segs; diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index e626732..958e5fe 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2817,9 +2817,9 @@ int sdhci_add_host(struct sdhci_host *host) * set notify to short power off notify timeout value. */ if (mmc->caps2 & MMC_CAP2_POWEROFF_NOTIFY) - mmc->power_notify_type = MMC_HOST_PW_NOTIFY_SHORT; + mmc->poweroff_notify_type = MMC_HOST_PW_OFF_NOTIFY_SHORT; else - mmc->power_notify_type = MMC_HOST_PW_NOTIFY_NONE; + mmc->poweroff_notify_type = MMC_HOST_PW_OFF_NOTIFY_NONE; /* Initial value for re-tuning timer count */ host->tuning_count = (caps[1] & SDHCI_RETUNING_TIMER_COUNT_MASK) >>