From patchwork Fri Jan 10 04:31:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 3464481 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BE1E5C02DC for ; Fri, 10 Jan 2014 04:31:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E3B6D20109 for ; Fri, 10 Jan 2014 04:31:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7226E20108 for ; Fri, 10 Jan 2014 04:31:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750793AbaAJEbc (ORCPT ); Thu, 9 Jan 2014 23:31:32 -0500 Received: from mailout2.samsung.com ([203.254.224.25]:20432 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750702AbaAJEbb (ORCPT ); Thu, 9 Jan 2014 23:31:31 -0500 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MZ600BZT4KDFT30@mailout2.samsung.com> for linux-mmc@vger.kernel.org; Fri, 10 Jan 2014 13:31:25 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.113]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id DD.C8.10364.C977FC25; Fri, 10 Jan 2014 13:31:25 +0900 (KST) X-AuditID: cbfee690-b7f266d00000287c-58-52cf779c42fb Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 8A.2B.28157.C977FC25; Fri, 10 Jan 2014 13:31:24 +0900 (KST) Received: from [10.252.81.186] by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MZ600AD24KCCH20@mmp2.samsung.com>; Fri, 10 Jan 2014 13:31:24 +0900 (KST) Message-id: <52CF77AA.3090203@samsung.com> Date: Fri, 10 Jan 2014 13:31:38 +0900 From: Jaehoon Chung User-Agent: Mozilla/5.0 (X11; Linux i686; rv:24.0) Gecko/20100101 Thunderbird/24.1.1 MIME-version: 1.0 To: "linux-mmc@vger.kernel.org" Cc: Chris Ball , Grant Likely , Ulf Hansson , Seungwon Jeon , Johan Rudholm Subject: [PATCH] mmc: core: modify the variable name from "mmc" to "host" Content-type: text/plain; charset=ISO-8859-1 Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprLIsWRmVeSWpSXmKPExsWyRsSkUHdu+fkggw/XWSwmXN7OaHHgzw5G i/ZzJ5gsjvzvZ7T4cP8is8XxteEObB53ru1h87jxaiGTR9+WVYwe35euYff4vEkugDWKyyYl NSezLLVI3y6BK2Nnt3zBLqGKG39uMTYw/uTrYuTkkBAwkbh/qocFwhaTuHBvPVsXIxeHkMBS RokZ11+xwBR1Pd3HCmILCUxnlNj3zBqi6DWjxJrnC5lBErwCWhL7lpxn7GLk4GARUJVYsT8c JMwmoCOx/dtxJhBbVCBMYuGCZywQ5YISPybfYwEpFxGwlmj+LQsyklngOKPE5X0HwWqEBTwl fmxtArOZgebsb53GBmHLS2xe85YZ4rZ17BJHm4xAbBYBAYlvkw+BzZQQkJXYdACqRFLi4Iob LBMYRWYh2TwLydRZSKYuYGRexSiaWpBcUJyUXmSiV5yYW1yal66XnJ+7iREYNaf/PZuwg/He AetDjMlAKycyS4km5wOjLq8k3tDYzMjC1MTU2Mjc0ow0YSVxXrVHSUFCAumJJanZqakFqUXx RaU5qcWHGJk4OKUaGBc6vm4U5nN4vUrohHmU3Vz+C7r3iwyui12ZsWRz7d0L12b8f1+y64LR 6lDOJ13b7gq1C84t0T+62KM66N0+pcvJsQHVD40yv3otvVSRb79n3hS5H7sC5d+WbTFSXuMU dXSL3Cvtj+HKh3VU7tW0T9x58Ux/g92U7OzAK5lPhAtUpx12z9l3J1KJpTgj0VCLuag4EQB0 NOtYsAIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNIsWRmVeSWpSXmKPExsVy+t9jQd055eeDDH6vsLKYcHk7o8WBPzsY LdrPnWCyOPK/n9Hiw/2LzBbH14Y7sHncubaHzePGq4VMHn1bVjF6fF+6ht3j8ya5ANaoBkab jNTElNQihdS85PyUzLx0WyXv4HjneFMzA0NdQ0sLcyWFvMTcVFslF58AXbfMHKALlBTKEnNK gUIBicXFSvp2mCaEhrjpWsA0Ruj6hgTB9RgZoIGENYwZO7vlC3YJVdz4c4uxgfEnXxcjJ4eE gIlE19N9rBC2mMSFe+vZQGwhgemMEvueWXcxcgHZrxkl1jxfyAyS4BXQkti35DxjFyMHB4uA qsSK/eEgYTYBHYnt344zgdiiAmESCxc8Y4EoF5T4MfkeC0i5iIC1RPNvWZCRzALHGSUu7zsI ViMs4CnxY2sTmM0MNGd/6zQ2CFteYvOat8wTGPlmIRk1C0nZLCRlCxiZVzGKphYkFxQnpeca 6RUn5haX5qXrJefnbmIER+Uz6R2MqxosDjEKcDAq8fCuKD4bJMSaWFZcmXuIUYKDWUmEl9X7 fJAQb0piZVVqUX58UWlOavEhxmSgRycyS4km5wMTRl5JvKGxiZmRpZG5oYWRsTlpwkrivAdb rQOFBNITS1KzU1MLUotgtjBxcEo1MM67Ex0z8Zndkb8/poelXGj/+0XQwiHgYYCKeKa56nWz RY7qE4QfRP1Q9N9xq7trT2v2Wt3MZa+FfKZwNzNO/fj8jkLeu28KDn/v7D6aXlERqdp46cSX VcsOpbEtl8wuLXJ0dXaeYn6Vz/HbejFWLrEt14rntrsz2Qr5Wac/fecg4Oe5yaI6WomlOCPR UIu5qDgRAPLuUSYOAwAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP mmc_host is used the "host" in core.c. To be consistent, change the variable name from "mmc" to "host". (Minor fixing) Signed-off-by: Jaehoon Chung --- drivers/mmc/core/core.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 098374b..123f1f9 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1265,7 +1265,7 @@ EXPORT_SYMBOL_GPL(mmc_regulator_get_ocrmask); * a particular supply voltage. This would normally be called from the * set_ios() method. */ -int mmc_regulator_set_ocr(struct mmc_host *mmc, +int mmc_regulator_set_ocr(struct mmc_host *host, struct regulator *supply, unsigned short vdd_bit) { @@ -1307,42 +1307,42 @@ int mmc_regulator_set_ocr(struct mmc_host *mmc, else result = 0; - if (result == 0 && !mmc->regulator_enabled) { + if (result == 0 && !host->regulator_enabled) { result = regulator_enable(supply); if (!result) - mmc->regulator_enabled = true; + host->regulator_enabled = true; } - } else if (mmc->regulator_enabled) { + } else if (host->regulator_enabled) { result = regulator_disable(supply); if (result == 0) - mmc->regulator_enabled = false; + host->regulator_enabled = false; } if (result) - dev_err(mmc_dev(mmc), + dev_err(mmc_dev(host), "could not set regulator OCR (%d)\n", result); return result; } EXPORT_SYMBOL_GPL(mmc_regulator_set_ocr); -int mmc_regulator_get_supply(struct mmc_host *mmc) +int mmc_regulator_get_supply(struct mmc_host *host) { - struct device *dev = mmc_dev(mmc); + struct device *dev = mmc_dev(host); struct regulator *supply; int ret; supply = devm_regulator_get(dev, "vmmc"); - mmc->supply.vmmc = supply; - mmc->supply.vqmmc = devm_regulator_get_optional(dev, "vqmmc"); + host->supply.vmmc = supply; + host->supply.vqmmc = devm_regulator_get_optional(dev, "vqmmc"); if (IS_ERR(supply)) return PTR_ERR(supply); ret = mmc_regulator_get_ocrmask(supply); if (ret > 0) - mmc->ocr_avail = ret; + host->ocr_avail = ret; else - dev_warn(mmc_dev(mmc), "Failed getting OCR mask: %d\n", ret); + dev_warn(mmc_dev(host), "Failed getting OCR mask: %d\n", ret); return 0; }