From patchwork Mon May 27 04:47:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 2617661 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 7A32A3FDBC for ; Mon, 27 May 2013 04:47:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750841Ab3E0Ers (ORCPT ); Mon, 27 May 2013 00:47:48 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:48371 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750772Ab3E0Err (ORCPT ); Mon, 27 May 2013 00:47:47 -0400 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 <0MNF00MT4XBM07M0@mailout2.samsung.com> for linux-mmc@vger.kernel.org; Mon, 27 May 2013 13:47:46 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.113]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id F5.3C.29708.275E2A15; Mon, 27 May 2013 13:47:46 +0900 (KST) X-AuditID: cbfee690-b7f6f6d00000740c-87-51a2e572fecc Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 03.EE.28381.275E2A15; Mon, 27 May 2013 13:47:46 +0900 (KST) Received: from [10.90.51.55] by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MNF00K7EXBMY120@mmp2.samsung.com>; Mon, 27 May 2013 13:47:46 +0900 (KST) Message-id: <51A2E57D.1000902@samsung.com> Date: Mon, 27 May 2013 13:47:57 +0900 From: Jaehoon Chung User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130510 Thunderbird/17.0.6 MIME-version: 1.0 To: "linux-mmc@vger.kernel.org" Cc: 'Chris Ball' , Seungwon Jeon , Will Newton , James Hogan Subject: [PATCH] mmc: dw_mmc: change the macro name from DTO to DRTO Content-type: text/plain; charset=ISO-8859-1 Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprNIsWRmVeSWpSXmKPExsWyRsSkULfo6aJAg2Mf1Cy2v97IZvFu3gtm iyP/+xktPty/yGyxcNMhNgdWj52z7rJ79Ow8w+hx6MpaRo++LasYPT5vkgtgjeKySUnNySxL LdK3S+DK2NhoVbCPt2LqvDb2Bsa/XF2MnBwSAiYSi879ZIewxSQu3FvP1sXIxSEksJRRYtqJ KawwRc/fP2SCSExnlHixbxMjhPOSUeLqrjdg7bwCWhK37nxjBrFZBFQlGg8eBYuzCehIbP92 nAnEFhUIk9jU08wEUS8o8WPyPZYuRg4OEQFriebfsiBhZoEpjBLrtoiD2MICLhJr9p5kh4jr SOxvncYGYctLbF7zlhnkBgmBZewSL6Y8hNorIPFt8iGwmRICshKbDjBDPCApcXDFDZYJjCKz kGyehWTsLCRjFzAyr2IUTS1ILihOSi8y0StOzC0uzUvXS87P3cQIjJjT/55N2MF474D1IcZk oJUTmaVEk/OBEZdXEm9obGZkYWpiamxkbmlGmrCSOK96i3WgkEB6YklqdmpqQWpRfFFpTmrx IUYmDk6pBsYqz4g1DGrvw7f2bV7MujJKWudjh6v19lXfzCxagqSTp/36FyWV/VE92/pvQn3n 81NLTRknXNWty/b6MnuzJRen4pnAjGrTaFmT/a9ZI/9LnXM+oLiGeeuHLbPKTi2w3XLJ4nJ+ QoSM0V+7hW4uvybLenG4KG2Y39o27/KkusdHXUMe/E7IylFiKc5INNRiLipOBABF70QbrgIA AA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBIsWRmVeSWpSXmKPExsVy+t9jQd2ip4sCDd51yVtsf72RzeLdvBfM Fkf+9zNafLh/kdli4aZDbA6sHjtn3WX36Nl5htHj0JW1jB59W1YxenzeJBfAGtXAaJORmpiS WqSQmpecn5KZl26r5B0c7xxvamZgqGtoaWGupJCXmJtqq+TiE6DrlpkDtF1JoSwxpxQoFJBY XKykb4dpQmiIm64FTGOErm9IEFyPkQEaSFjDmLGx0apgH2/F1Hlt7A2Mf7m6GDk5JARMJJ6/ f8gEYYtJXLi3nq2LkYtDSGA6o8SLfZsYIZyXjBJXd71hB6niFdCSuHXnGzOIzSKgKtF48ChY nE1AR2L7t+Ngk0QFwiQ29TQzQdQLSvyYfI+li5GDQ0TAWqL5tyxImFlgCqPEui3iILawgIvE mr0n2SHiOhL7W6exQdjyEpvXvGWewMg3C8mkWUjKZiEpW8DIvIpRNLUguaA4KT3XUK84Mbe4 NC9dLzk/dxMjOB6fSe1gXNlgcYhRgINRiYf3x6xFgUKsiWXFlbmHGCU4mJVEeBOigUK8KYmV ValF+fFFpTmpxYcYk4EencgsJZqcD0wVeSXxhsYmZkaWRuaGFkbG5qQJK4nzHmi1DhQSSE8s Sc1OTS1ILYLZwsTBKdXAeFKO8egh5cSssyLbZ8WcmSiWqTvNaP1FZpV4P+0nR95ujq1nKbq+ IPrnvJDshRFXZV3Vj966+JxxEuv/pI7r2neUVtpNW38tNcRbqaR9urSftKuvfvv5mQf4nk3z X+SiKZw2ue7iJ87LrLbf+BNqDjbkJzcduKdZyqD03y9VVvz6tXWntkXsUWIpzkg01GIuKk4E AGWoCTkLAwAA 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 At Interrupt status register, Bit9 is Data Read Timeout. But we used macro name as the DTO. It could be confused with the Data Transfer Over(DTO)-Bit[3]. it's clearly that is changed the DRTO instead of DTO. Signed-off-by: Jaehoon Chung Reviewed-by: James Hogan Acked-by: Seungwon Jeon --- drivers/mmc/host/dw_mmc.c | 4 ++-- drivers/mmc/host/dw_mmc.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index b10e5e1..7dca5e9 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -39,7 +39,7 @@ #include "dw_mmc.h" /* Common flag combinations */ -#define DW_MCI_DATA_ERROR_FLAGS (SDMMC_INT_DTO | SDMMC_INT_DCRC | \ +#define DW_MCI_DATA_ERROR_FLAGS (SDMMC_INT_DRTO | SDMMC_INT_DCRC | \ SDMMC_INT_HTO | SDMMC_INT_SBE | \ SDMMC_INT_EBE) #define DW_MCI_CMD_ERROR_FLAGS (SDMMC_INT_RTO | SDMMC_INT_RCRC | \ @@ -1093,7 +1093,7 @@ static void dw_mci_tasklet_func(unsigned long priv) status = host->data_status; if (status & DW_MCI_DATA_ERROR_FLAGS) { - if (status & SDMMC_INT_DTO) { + if (status & SDMMC_INT_DRTO) { data->error = -ETIMEDOUT; } else if (status & SDMMC_INT_DCRC) { data->error = -EILSEQ; diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h index 0b74189..2f52c87 100644 --- a/drivers/mmc/host/dw_mmc.h +++ b/drivers/mmc/host/dw_mmc.h @@ -98,7 +98,7 @@ #define SDMMC_INT_HLE BIT(12) #define SDMMC_INT_FRUN BIT(11) #define SDMMC_INT_HTO BIT(10) -#define SDMMC_INT_DTO BIT(9) +#define SDMMC_INT_DRTO BIT(9) #define SDMMC_INT_RTO BIT(8) #define SDMMC_INT_DCRC BIT(7) #define SDMMC_INT_RCRC BIT(6)