From patchwork Mon Jun 5 04:41:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 9765487 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5EBBD60353 for ; Mon, 5 Jun 2017 04:41:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5013627F3E for ; Mon, 5 Jun 2017 04:41:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 419EE27FA6; Mon, 5 Jun 2017 04:41:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA00827F3E for ; Mon, 5 Jun 2017 04:41:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751270AbdFEElq (ORCPT ); Mon, 5 Jun 2017 00:41:46 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:32922 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751308AbdFEElk (ORCPT ); Mon, 5 Jun 2017 00:41:40 -0400 Received: from epcas1p3.samsung.com (unknown [182.195.41.47]) by mailout3.samsung.com (KnoxPortal) with ESMTP id 20170605044138epoutp034c87e9f9d1d78a4cd190c93acd5c43d7~FIA6eqZyD1249612496epoutp03a; Mon, 5 Jun 2017 04:41:38 +0000 (GMT) Received: from epsmges1p2.samsung.com (unknown [182.195.40.66]) by epcas1p4.samsung.com (KnoxPortal) with ESMTP id 20170605044138epcas1p45eaff32629e77930a7d23bacfec11cf5~FIA6PtMy_2526725267epcas1p4W; Mon, 5 Jun 2017 04:41:38 +0000 (GMT) Received: from epcas1p3.samsung.com ( [182.195.41.47]) by epsmges1p2.samsung.com (Symantec Messaging Gateway) with SMTP id D8.53.11213.101E4395; Mon, 5 Jun 2017 13:41:38 +0900 (KST) Received: from epsmgms2p1.samsung.com (unknown [182.195.42.79]) by epcas1p4.samsung.com (KnoxPortal) with ESMTP id 20170605044137epcas1p4c0df9a32c3987a0c4751900cdb439650~FIA52jV9k2526725267epcas1p4R; Mon, 5 Jun 2017 04:41:37 +0000 (GMT) X-AuditID: b6c32a36-f79446d000002bcd-30-5934e1012a15 Received: from epmmp1.local.host ( [203.254.227.16]) by epsmgms2p1.samsung.com (Symantec Messaging Gateway) with SMTP id F0.F1.02179.101E4395; Mon, 5 Jun 2017 13:41:37 +0900 (KST) Received: from localhost.localdomain ([10.113.62.216]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OR200A0S51CWR90@mmp1.samsung.com>; Mon, 05 Jun 2017 13:41:37 +0900 (KST) From: Jaehoon Chung To: linux-mmc@vger.kernel.org Cc: ulf.hansson@linaro.org, shawn.lin@rock-chips.com, Jaehoon Chung Subject: [PATCH 4/6] mmc: dw_mmc: remove the 'id' arguments about functions relevant to slot Date: Mon, 05 Jun 2017 13:41:33 +0900 Message-id: <20170605044135.18304-5-jh80.chung@samsung.com> X-Mailer: git-send-email 2.10.2 In-reply-to: <20170605044135.18304-1-jh80.chung@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrNKsWRmVeSWpSXmKPExsWy7bCmvi7TQ5NIgwWnmC1u/GpjtTjyv5/R 4s6T9awWx9eGO7B43Lm2h83j76z9LB59W1YxenzeJBfAEpVqk5GamJJapJCal5yfkpmXbqvk HRzvHG9qZmCoa2hpYa6kkJeYm2qr5OIToOuWmQO0UUmhLDGnFCgUkFhcrKRvZ1OUX1qSqpCR X1xiqxRtaGikZ2hgrmdkZKRnYhxrZWQKVJKQmvFkyRy2gj6Bit2dS9kbGCfxdjFycEgImEic OlDWxcgJZIpJXLi3nq2LkYtDSGAHo8Sn/ZugnM+MEmemv2SCqDKRmHfiCULVraczmCGcH4wS iz+fZwSpYhPQkdj+7ThYh4iArMTPPxfYQGxmgTiJ5o2rwWqEgeyZq/eygNgsAqoSEz9dZQax eQWsJb6cWcwMsU1eYuH5I2BzOAVsJFbffQR1xR42iV87WSFekJXYdACq3EViT8tpVghbWOLV 8S3sELaUROPLh0wgd0oItAMd/WMfG4TTwShx8OdeqA5jiVNdjUwQh/JJvPvaA7WAV6KjTQii xEPi0YnHUEMdJZ5ufsgK8Xw/o8Sjd+vYJzDKLGBkWMUollpQnJueWmxYYKRXnJhbXJqXrpec n7uJEZxQtMx2MC4653OIUYCDUYmHVyLTJFKINbGsuDL3EKMEB7OSCG/xdaAQb0piZVVqUX58 UWlOavEhRlNgOE1klhJNzgcmu7ySeEMTSwMTMyNgGrE0NFQS5xVdfy1CSCA9sSQ1OzW1ILUI po+Jg1OqgbGcx7Jcb8Ij2XePrbu6Vf7Zpb+scDT6qMSrJvkuyt2sfUmqq2q4xlP2z9EhPytT jRYEWNnyWacz9H5mfhd6UXNz6PeYZVyuhS1LJi4KeK5WP6HjMu/2cwFfP94y5j108aKn9bn+ 3mezJ7qU1Al9uGPzXek6Z4NXytM7zZ+37zItWnHQ+9E5CyWW4oxEQy3mouJEAMTx0Bw+AwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrFLMWRmVeSWpSXmKPExsVy+t9jAV3GhyaRBv396hY3frWxWhz5389o cefJelaL42vDHVg87lzbw+bxd9Z+Fo++LasYPT5vkgtgiXKzyUhNTEktUkjNS85PycxLt1UK DXHTtVBSyEvMTbVVitD1DQlSUihLzCkF8owM0ICDc4B7sJK+XYJbxpMlc9gK+gQqdncuZW9g nMTbxcjJISFgIjHvxBM2CFtM4sK99UA2F4eQwDZGifW3m6CcH4wSH+Y8ZwKpYhPQkdj+7TiY LSIgK/HzzwWwbmaBOIlFR3+yg9jCQPbM1XtZQGwWAVWJiZ+uMoPYvALWEl/OLGaG2CYvsfD8 EbA5nAI2EqvvPgKzhYBqrrQ3MU1g5F3AyLCKkSu1oDg3PbfYqMBwEyMwHLcd1vLfwfjjbPQh RgEORiUeXolMk0gh1sSy4srcQ4wSHMxKIrzF14FCvCmJlVWpRfnxRaU5qcWHGE2BTpnILCWa nA+MlbySeEMTSyMTAzMzQyMDYzMlcd4JgV8ihATSE0tSs1NTC1KLYPqYODilGhgdysSiZjlv vWb9s3jWy0ifUt5vS57xCZ3ODEjfW8L/c9Hq6nXnTkqvOtyc/3TtoblaAplvdDn5dq8Td/2r P2v1v0v/JixmPc3H43e1Ifd3+2rBKyeTNaMa7rlvzGktE036E58h9CO8dlscQ6+JQGGqf+qC aa5Xr//Vfj6/ry/Le16/hMmrVTOUWIozEg21mIuKEwGYcHuCXQIAAA== X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170605044137epcas1p4c0df9a32c3987a0c4751900cdb439650 X-Msg-Generator: CA X-Sender-IP: 182.195.42.79 X-Local-Sender: =?UTF-8?B?7KCV7J6s7ZuIG1RpemVuIFBsYXRmb3JtIExhYihTL1fshLw=?= =?UTF-8?B?7YSwKRvsgrzshLHsoITsnpAbU2VuaW9yIEVuZ2luZWVy?= X-Global-Sender: =?UTF-8?B?SmFlaG9vbiBDaHVuZxtUaXplbiBQbGF0Zm9ybSBMYWIuG1Nh?= =?UTF-8?B?bXN1bmcgRWxlY3Ryb25pY3MbU2VuaW9yIEVuZ2luZWVy?= X-Sender-Code: =?UTF-8?B?QzEwG1RFTEUbQzEwVjgxMTE=?= CMS-TYPE: 101P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20170605044137epcas1p4c0df9a32c3987a0c4751900cdb439650 X-RootMTR: 20170605044137epcas1p4c0df9a32c3987a0c4751900cdb439650 References: <20170605044135.18304-1-jh80.chung@samsung.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Doesn't need to pass the id value for slot functions. Signed-off-by: Jaehoon Chung --- drivers/mmc/host/dw_mmc.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 8ed3c87..8a4fa88 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2688,7 +2688,7 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } -static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) +static int dw_mci_init_slot(struct dw_mci *host) { struct mmc_host *mmc; struct dw_mci_slot *slot; @@ -2701,8 +2701,8 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) return -ENOMEM; slot = mmc_priv(mmc); - slot->id = id; - slot->sdio_id = host->sdio_id0 + id; + slot->id = 0; + slot->sdio_id = host->sdio_id0 + slot->id; slot->mmc = mmc; slot->host = host; host->slot = slot; @@ -2801,7 +2801,7 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) return ret; } -static void dw_mci_cleanup_slot(struct dw_mci_slot *slot, unsigned int id) +static void dw_mci_cleanup_slot(struct dw_mci_slot *slot) { /* Debugfs stuff is cleaned up by mmc core */ mmc_remove_host(slot->mmc); @@ -3197,7 +3197,7 @@ int dw_mci_probe(struct dw_mci *host) host->irq, width, fifo_size); /* We need at least one slot to succeed */ - ret = dw_mci_init_slot(host, 0); + ret = dw_mci_init_slot(host); if (ret) { dev_dbg(host->dev, "slot %d init failed\n", i); goto err_dmaunmap; @@ -3227,11 +3227,9 @@ EXPORT_SYMBOL(dw_mci_probe); void dw_mci_remove(struct dw_mci *host) { - int i = 0; - - dev_dbg(host->dev, "remove slot %d\n", i); + dev_dbg(host->dev, "remove slot\n"); if (host->slot) - dw_mci_cleanup_slot(host->slot, i); + dw_mci_cleanup_slot(host->slot); mci_writel(host, RINTSTS, 0xFFFFFFFF); mci_writel(host, INTMASK, 0); /* disable all mmc interrupt first */