From patchwork Fri Sep 5 05:14:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 4849731 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 33B0DC0338 for ; Fri, 5 Sep 2014 05:15:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F34E420256 for ; Fri, 5 Sep 2014 05:15:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0CFD520265 for ; Fri, 5 Sep 2014 05:15:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750715AbaIEFP0 (ORCPT ); Fri, 5 Sep 2014 01:15:26 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:36812 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751396AbaIEFPG (ORCPT ); Fri, 5 Sep 2014 01:15:06 -0400 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NBE00KC6X92CKB0@mailout4.samsung.com> for linux-mmc@vger.kernel.org; Fri, 05 Sep 2014 14:15:02 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.114]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id AA.6D.04513.6D649045; Fri, 05 Sep 2014 14:15:02 +0900 (KST) X-AuditID: cbfee691-f79546d0000011a1-9c-540946d6fd9e Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 02.C7.04943.6D649045; Fri, 05 Sep 2014 14:15:02 +0900 (KST) Received: from localhost.localdomain ([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 <0NBE007OMX924670@mmp2.samsung.com>; Fri, 05 Sep 2014 14:15:02 +0900 (KST) From: Jaehoon Chung To: linux-mmc Cc: Chris Ball , Ulf Hansson , tgih.jun@samsung.com, Jaehoon Chung Subject: [PATCH 2/4] mmc: dw_mmc: remove the blk-settings structure Date: Fri, 05 Sep 2014 14:14:58 +0900 Message-id: <1409894100-4713-3-git-send-email-jh80.chung@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1409894100-4713-1-git-send-email-jh80.chung@samsung.com> References: <1409894100-4713-1-git-send-email-jh80.chung@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrFLMWRmVeSWpSXmKPExsWyRsSkSPeaG2eIwdOjJhYTLm9ntLjxq43V 4sj/fkaLD/cvMlscXxvuwOpx59oeNo8brxYyefRtWcXo8XmTXABLFJdNSmpOZllqkb5dAlfG zpfmBZOEK46d2MbewPiRv4uRk0NCwETi69kHLBC2mMSFe+vZuhi5OIQEljJKtJ15zApT1Hpt PjNEYjqjxJbTn6Gq2pgkjrUeB2tnE9CR2P7tOBOILSKgKdG5fSVYEbNAO6NEV895sFHCAs4S fS0TmEFsFgFViXfvtwIVcXDwCrhKfHmbCWJKCChIzJlkA1LBKeAm8ejLFjYQWwio4vKkPSwg IyUEmtkl7v2bxAgxRkDi2+RDLBC9shKbDjBDHC0pcXDFDZYJjMILGBlWMYqmFiQXFCelF5nq FSfmFpfmpesl5+duYgQG8el/zybuYLx/wPoQowAHoxIP74+vHCFCrIllxZW5hxhNgTZMZJYS Tc4HxkpeSbyhsZmRhamJqbGRuaWZkjivjvTPYCGB9MSS1OzU1ILUovii0pzU4kOMTBycUg2M 0n3MXYfOVGle3xqjFePan2LJusKN8UL5N0Y1ncyJ5zZyu9VlbFjjtrpAsYvnbIXt5N8/q7Kd q/P9vau6CyKtuy7O4Kxy2fb4ddCmDbcjbwiueHh+UUCg/dT/e2JnzvrlsGneX7ZZprOUHFZ4 xj3V7bfMMarZI9B/5Nvs19vKHNTXXdYze/pCiaU4I9FQi7moOBEA1ssMsF0CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprCIsWRmVeSWpSXmKPExsVy+t9jQd1rbpwhBjuf6FpMuLyd0eLGrzZW iyP/+xktPty/yGxxfG24A6vHnWt72DxuvFrI5NG3ZRWjx+dNcgEsUQ2MNhmpiSmpRQqpecn5 KZl56bZK3sHxzvGmZgaGuoaWFuZKCnmJuam2Si4+AbpumTlAe5UUyhJzSoFCAYnFxUr6dpgm hIa46VrANEbo+oYEwfUYGaCBhDWMGTtfmhdMEq44dmIbewPjR/4uRk4OCQETidZr85khbDGJ C/fWs3UxcnEICUxnlNhy+jOU08Ykcaz1OAtIFZuAjsT2b8eZQGwRAU2Jzu0rwYqYBdoZJbp6 zrOCJIQFnCX6WiaAjWURUJV4934rUBEHB6+Aq8SXt5kgpoSAgsScSTYgFZwCbhKPvmxhA7GF gCouT9rDMoGRdwEjwypG0dSC5ILipPRcQ73ixNzi0rx0veT83E2M4Bh5JrWDcWWDxSFGAQ5G JR7eBZ85QoRYE8uKK3MPMUpwMCuJ8Hq9AQrxpiRWVqUW5ccXleakFh9iNAW6aSKzlGhyPjB+ 80riDY1NzIwsjcwNLYyMzZXEeQ+0WgcKCaQnlqRmp6YWpBbB9DFxcEo1MJr1vLKdt1t2s6BJ Ba/5pVD2/R9CAnTO8W/nlVY4zcgb8TbnPGvP7xQD6VPfPIucT9lfXXHoNkP5JB3pVxpfpEzD H+yT/qx0gD+8z7r9UZf51SXv818vYzjS4XvkRsSfQ2dLpd5Oe3HsyNbdfosnLRRp2f/t5LL8 9k1OrqkzaxWbr9pf12rxvqHEUpyRaKjFXFScCABeR2DOpwIAAA== 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=-8.6 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 It don't use anywhere. So it's meaningless. Signed-off-by: Jaehoon Chung --- drivers/mmc/host/dw_mmc.c | 13 +++---------- include/linux/mmc/dw_mmc.h | 9 --------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index b8e0ca8..0d31a8c 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2287,27 +2287,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; - } else { + + if (IS_ENABLED(CONFIG_MMC_DW_IDMAC)) { /* Useful defaults if platform data is unset. */ -#ifdef CONFIG_MMC_DW_IDMAC mmc->max_segs = host->ring_size; mmc->max_blk_size = 65536; mmc->max_blk_count = host->ring_size; mmc->max_seg_size = 0x1000; mmc->max_req_size = mmc->max_seg_size * mmc->max_blk_count; -#else + } 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; -#endif /* CONFIG_MMC_DW_IDMAC */ } if (dw_mci_get_cd(mmc)) diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h index 0013669..6dcc1c1 100644 --- a/include/linux/mmc/dw_mmc.h +++ b/include/linux/mmc/dw_mmc.h @@ -224,14 +224,6 @@ struct dw_mci_dma_ops { struct dma_pdata; -struct block_settings { - unsigned short max_segs; /* see blk_queue_max_segments */ - unsigned int max_blk_size; /* maximum size of one mmc block */ - unsigned int max_blk_count; /* maximum number of blocks in one req*/ - unsigned int max_req_size; /* maximum number of bytes in one req*/ - unsigned int max_seg_size; /* see blk_queue_max_segment_size */ -}; - /* Board platform data */ struct dw_mci_board { u32 num_slots; @@ -254,7 +246,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 */