From patchwork Thu Dec 24 09:41:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 7916251 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 17BB9BEEE5 for ; Thu, 24 Dec 2015 09:41:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3D7CF204EA for ; Thu, 24 Dec 2015 09:41:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B8898204E7 for ; Thu, 24 Dec 2015 09:41:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751036AbbLXJlR (ORCPT ); Thu, 24 Dec 2015 04:41:17 -0500 Received: from mailout1.samsung.com ([203.254.224.24]:48110 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750771AbbLXJlN (ORCPT ); Thu, 24 Dec 2015 04:41:13 -0500 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NZU01MVWW8NFF60@mailout1.samsung.com> for linux-mmc@vger.kernel.org; Thu, 24 Dec 2015 18:41:11 +0900 (KST) Received: from epcpsbgm2new.samsung.com ( [172.20.52.115]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id E3.09.04886.7BDBB765; Thu, 24 Dec 2015 18:41:11 +0900 (KST) X-AuditID: cbfee690-f79646d000001316-f9-567bbdb76cb7 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2new.samsung.com (EPCPMTA) with SMTP id F0.66.09068.7BDBB765; Thu, 24 Dec 2015 18:41:11 +0900 (KST) Received: from localhost.localdomain ([10.113.62.216]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NZU007ZRW8HUY70@mmp2.samsung.com>; Thu, 24 Dec 2015 18:41:11 +0900 (KST) From: Jaehoon Chung To: linux-mmc@vger.kernel.org Cc: ulf.hansson@linaro.org, Jaehoon Chung Subject: [PATCH] mmc: dw_mmc: remove the unused quirks Date: Thu, 24 Dec 2015 18:41:03 +0900 Message-id: <1450950063-5359-1-git-send-email-jh80.chung@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrCLMWRmVeSWpSXmKPExsWyRsSkWHf73uowg9MLRSxu/GpjtTjyv5/R 4vjacAdmjzvX9rB59G1ZxejxeZNcAHMUl01Kak5mWWqRvl0CV8bF7nVsBQeEK74/aWBpYPzM 38XIySEhYCKx+ssmNghbTOLCvfVANheHkMAKRommn50sMEU3t39hgUjMYpR4/P4HlPODUWLL rAmMIFVsAjoS278dZwKxRQRkJX7+uQA2llnASeLqvU52EFtYwExi/9tGoHoODhYBVYld07hA wrwCrhL3Hh9khFgmJ3Hy2GRWkPkSArfZJDo3vgdLsAgISHybfIgFpFcCaP6mA8wQ9ZISB1fc YJnAKLiAkWEVo2hqQXJBcVJ6kYlecWJucWleul5yfu4mRmDgnf73bMIOxnsHrA8xCnAwKvHw StyqChNiTSwrrsw9xGgKtGEis5Rocj4wvPNK4g2NzYwsTE1MjY3MLc2UxHlfS/0MFhJITyxJ zU5NLUgtii8qzUktPsTIxMEp1cAYcOJBkaWRY1K71EmvXbmJ73IkKl/+r+O+kVH/9Nt5hQS+ c+9cw3bLnq6N++S38rth2KLE2pRTp72F9tSYzZLvmXt0f9Hy6sCbJeVblI+qOs5TaeRgO863 1S2LVfVXtfo9iR2MmkVc50vmhO+5MXmhnNMu1fNWiyUX2ra5Bb1zOM9ls/a0S5gSS3FGoqEW c1FxIgBa/tbDNwIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrILMWRmVeSWpSXmKPExsVy+t9jQd3te6vDDA6u57e48auN1eLI/35G i+Nrwx2YPe5c28Pm0bdlFaPH501yAcxRDYw2GamJKalFCql5yfkpmXnptkrewfHO8aZmBoa6 hpYW5koKeYm5qbZKLj4Bum6ZOUCLlBTKEnNKgUIBicXFSvp2mCaEhrjpWsA0Ruj6hgTB9RgZ oIGENYwZF7vXsRUcEK74/qSBpYHxM38XIyeHhICJxM3tX1ggbDGJC/fWs3UxcnEICcxilHj8 /gcLhPODUWLLrAmMIFVsAjoS278dZwKxRQRkJX7+ucAGYjMLOElcvdfJDmILC5hJ7H/bCFTP wcEioCqxaxoXSJhXwFXi3uODjBDL5CROHpvMOoGRewEjwypGidSC5ILipPRco7zUcr3ixNzi 0rx0veT83E2M4OB+Jr2D8fAu90OMAhyMSjy8hXeqwoRYE8uKK3MPMUpwMCuJ8Mpvqw4T4k1J rKxKLcqPLyrNSS0+xGgKtH8is5Rocj4w8vJK4g2NTcyMLI3MDS2MjM2VxHn3XYoMExJITyxJ zU5NLUgtgulj4uCUamDUOvPJ9+SnF+1eSsrFF3kaRe8mGlbW9t60mt4vrvZj9dQdD8t/r7hR 96N1c3aah3H5nb0OFxde2fEqvzb1VfqpSokMzSeT3DdbXnqdZdN9OyXuPpvYB6cjLaoB5p/0 3MUdYlOTPga6Cd3l3M2TWTmh49C+vetOKpUxzlbjeNxYqGywa45LY5gSS3FGoqEWc1FxIgBI P9NohAIAAA== 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 Removed the unused quirks. These quirks don't used anywhere. Signed-off-by: Jaehoon Chung --- drivers/mmc/host/dw_mmc.c | 19 ------------------- include/linux/mmc/dw_mmc.h | 10 ++-------- 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index fb204ee..7128351 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1634,12 +1634,6 @@ static int dw_mci_command_complete(struct dw_mci *host, struct mmc_command *cmd) else cmd->error = 0; - if (cmd->error) { - /* newer ip versions need a delay between retries */ - if (host->quirks & DW_MCI_QUIRK_RETRY_DELAY) - mdelay(20); - } - return cmd->error; } @@ -2355,16 +2349,6 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id) pending = mci_readl(host, MINTSTS); /* read-only mask reg */ - /* - * DTO fix - version 2.10a and below, and only if internal DMA - * is configured. - */ - if (host->quirks & DW_MCI_QUIRK_IDMAC_DTO) { - if (!pending && - ((mci_readl(host, STATUS) >> 17) & 0x1fff)) - pending |= SDMMC_INT_DATA_OVER; - } - if (pending) { /* Check volt switch first, since it can look like an error */ if ((host->state == STATE_SENDING_CMD11) && @@ -3165,9 +3149,6 @@ int dw_mci_probe(struct dw_mci *host) /* Now that slots are all setup, we can enable card detect */ dw_mci_enable_cd(host); - if (host->quirks & DW_MCI_QUIRK_IDMAC_DTO) - dev_info(host->dev, "Internal DMAC interrupt fix enabled.\n"); - return 0; err_dmaunmap: diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h index 7776afb..89df7ab 100644 --- a/include/linux/mmc/dw_mmc.h +++ b/include/linux/mmc/dw_mmc.h @@ -235,16 +235,10 @@ struct dw_mci_dma_ops { }; /* IP Quirks/flags. */ -/* DTO fix for command transmission with IDMAC configured */ -#define DW_MCI_QUIRK_IDMAC_DTO BIT(0) -/* delay needed between retries on some 2.11a implementations */ -#define DW_MCI_QUIRK_RETRY_DELAY BIT(1) -/* High Speed Capable - Supports HS cards (up to 50MHz) */ -#define DW_MCI_QUIRK_HIGHSPEED BIT(2) /* Unreliable card detection */ -#define DW_MCI_QUIRK_BROKEN_CARD_DETECTION BIT(3) +#define DW_MCI_QUIRK_BROKEN_CARD_DETECTION BIT(0) /* Timer for broken data transfer over scheme */ -#define DW_MCI_QUIRK_BROKEN_DTO BIT(4) +#define DW_MCI_QUIRK_BROKEN_DTO BIT(1) struct dma_pdata;