From patchwork Thu Aug 6 07:23:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 6956681 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 D5CF8C05AC for ; Thu, 6 Aug 2015 07:23:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0E4B22062B for ; Thu, 6 Aug 2015 07:23:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A29B620626 for ; Thu, 6 Aug 2015 07:23:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754781AbbHFHXb (ORCPT ); Thu, 6 Aug 2015 03:23:31 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:46420 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754614AbbHFHXa (ORCPT ); Thu, 6 Aug 2015 03:23:30 -0400 Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NSN02JGOGJ48840@mailout4.samsung.com> for linux-mmc@vger.kernel.org; Thu, 06 Aug 2015 16:23:28 +0900 (KST) Received: from epcpsbgm2new.samsung.com ( [172.20.52.116]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id 0E.ED.24422.07B03C55; Thu, 6 Aug 2015 16:23:28 +0900 (KST) X-AuditID: cbfee68f-f793b6d000005f66-99-55c30b7082b1 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2new.samsung.com (EPCPMTA) with SMTP id E5.1F.07062.07B03C55; Thu, 6 Aug 2015 16:23:28 +0900 (KST) Received: from localhost.localdomain ([10.252.81.186]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NSN007P2GJ4RG30@mmp2.samsung.com>; Thu, 06 Aug 2015 16:23:28 +0900 (KST) From: Jaehoon Chung To: linux-mmc@vger.kernel.org Cc: ulf.hansson@linaro.org, Jaehoon Chung Subject: [PATCH 2/3] mmc: dw_mmc: remove the unused blk_setting Date: Thu, 06 Aug 2015 16:23:25 +0900 Message-id: <1438845806-4486-2-git-send-email-jh80.chung@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1438845806-4486-1-git-send-email-jh80.chung@samsung.com> References: <1438845806-4486-1-git-send-email-jh80.chung@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrFLMWRmVeSWpSXmKPExsWyRsSkRLeA+3CowYPTuhY3frWxWhz5389o cXxtuAOzx51re9g8+rasYvT4vEkugDmKyyYlNSezLLVI3y6BK6Nh/laWghtCFd1XzjI1MO7m 72Lk5JAQMJF4M3kDC4QtJnHh3nq2LkYuDiGBFYwSDy/fZYEpmr+pgxEiMYtRYm3LAVaQhJDA D0aJQ1fzQWw2AR2J7d+OM4HYIgKyEj//XGADsZkFnCSu3utk72Lk4BAWsJdYuNEYJMwioCqx uOMLM0iYV8BVYs60eIhVchInj00Gm84p4CZxYOMmFohNrhIv236CnSAh8JlN4szqzcwQcwQk vk0+xAIyRwJo7aYDzBBzJCUOrrjBMoFReAEjwypG0dSC5ILipPQiY73ixNzi0rx0veT83E2M wCA9/e9Z/w7GuwesDzEKcDAq8fA+WHMoVIg1say4MvcQoynQhonMUqLJ+cBYyCuJNzQ2M7Iw NTE1NjK3NFMS510o9TNYSCA9sSQ1OzW1ILUovqg0J7X4ECMTB6dUA2O1cK2D6budj1iapv6Q T5r5/6TbZwtn8TdHm4sVtzk8T+Y8ySp5NnvR0zs/3/z8oHiO49SWrASBzLh5Oz79sjg265Xx j2NbeCebvqtmClbe5dZ+N6Jd+exm+5TwkIcR7zJ27J/9zPTs8Yf1pQtDuV6unPzeNPLyPiNm t5q8rQ8lj0/fUnt/kfkLJZbijERDLeai4kQA+rZzi00CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpnkeLIzCtJLcpLzFFi42I5/e+xoG4B9+FQg8uP1Sxu/GpjtTjyv5/R 4vjacAdmjzvX9rB59G1ZxejxeZNcAHNUA6NNRmpiSmqRQmpecn5KZl66rZJ3cLxzvKmZgaGu oaWFuZJCXmJuqq2Si0+ArltmDtAiJYWyxJxSoFBAYnGxkr4dpgmhIW66FjCNEbq+IUFwPUYG aCBhDWNGw/ytLAU3hCq6r5xlamDczd/FyMkhIWAiMX9TByOELSZx4d56ti5GLg4hgVmMEmtb DrCCJIQEfjBKHLqaD2KzCehIbP92nAnEFhGQlfj55wIbiM0s4CRx9V4nexcjB4ewgL3Ewo3G IGEWAVWJxR1fmEHCvAKuEnOmxUOskpM4eWwy2HROATeJAxs3sUBscpV42faTcQIj7wJGhlWM EqkFyQXFSem5Rnmp5XrFibnFpXnpesn5uZsYwZHwTHoH4+Fd7ocYBTgYlXh4H6w5FCrEmlhW XJl7iFGCg1lJhHfrBaAQb0piZVVqUX58UWlOavEhRlOguyYyS4km5wOjNK8k3tDYxMzI0sjc 0MLI2FxJnFffZFOokEB6YklqdmpqQWoRTB8TB6dUA6NDzxK+rmAz5fsqJkVP5e9xL/KPqLij 8S5g2rXWuoIlb0+wPTZsVPxz50xk9qT4P5+K1D3DMl19zrEsO7b05+lzAbsUhC9mRV9nkrJy Oem9Z3e52Vs//U7hE/90DdZJbhQtW31BeMfPtd0Hp4Tv3uk28WzL6sB78z9WXNAx/2t5urAp wH5jTbESS3FGoqEWc1FxIgBSTmQ5mgIAAA== 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=-7.0 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 "blk_setting" doesn't use anywhere. Signed-off-by: Jaehoon Chung Reviewed-by: Alim Akhtar Tested-by: Alim Akhtar --- drivers/mmc/host/dw_mmc.c | 34 +++++++++++++--------------------- include/linux/mmc/dw_mmc.h | 1 - 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index de88e64..091df65 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2436,28 +2436,20 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) if (ret) goto err_host_allocated; - if (host->pdata->blk_settings) { - mmc->max_segs = host->pdata->blk_settings->max_segs; - mmc->max_blk_size = host->pdata->blk_settings->max_blk_size; - mmc->max_blk_count = host->pdata->blk_settings->max_blk_count; - mmc->max_req_size = host->pdata->blk_settings->max_req_size; - mmc->max_seg_size = host->pdata->blk_settings->max_seg_size; + /* Useful defaults if platform data is unset. */ + if (host->use_dma) { + mmc->max_segs = host->ring_size; + mmc->max_blk_size = 65536; + mmc->max_seg_size = 0x1000; + mmc->max_req_size = mmc->max_seg_size * host->ring_size; + mmc->max_blk_count = mmc->max_req_size / 512; } else { - /* Useful defaults if platform data is unset. */ - if (host->use_dma) { - mmc->max_segs = host->ring_size; - mmc->max_blk_size = 65536; - mmc->max_seg_size = 0x1000; - mmc->max_req_size = mmc->max_seg_size * host->ring_size; - mmc->max_blk_count = mmc->max_req_size / 512; - } else { - mmc->max_segs = 64; - mmc->max_blk_size = 65536; /* BLKSIZ is 16 bits */ - mmc->max_blk_count = 512; - mmc->max_req_size = mmc->max_blk_size * - mmc->max_blk_count; - mmc->max_seg_size = mmc->max_req_size; - } + mmc->max_segs = 64; + mmc->max_blk_size = 65536; /* BLKSIZ is 16 bits */ + mmc->max_blk_count = 512; + mmc->max_req_size = mmc->max_blk_size * + mmc->max_blk_count; + mmc->max_seg_size = mmc->max_req_size; } if (dw_mci_get_cd(mmc)) diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h index 5be9767..9c06f2d 100644 --- a/include/linux/mmc/dw_mmc.h +++ b/include/linux/mmc/dw_mmc.h @@ -259,7 +259,6 @@ struct dw_mci_board { struct dw_mci_dma_ops *dma_ops; struct dma_pdata *data; - struct block_settings *blk_settings; }; #endif /* LINUX_MMC_DW_MMC_H */