From patchwork Tue Jul 21 09:44:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangbo Lu X-Patchwork-Id: 498130 X-Patchwork-Delegate: scottwood@freescale.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 068821402AC for ; Tue, 21 Jul 2015 19:51:03 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id E11281A1D06 for ; Tue, 21 Jul 2015 19:51:02 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org X-Greylist: delayed 97567 seconds by postgrey-1.35 at bilbo; Tue, 21 Jul 2015 19:49:58 AEST Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1on0139.outbound.protection.outlook.com [157.56.110.139]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id E24521A0072 for ; Tue, 21 Jul 2015 19:49:58 +1000 (AEST) Received: from BLUPR0301CA0039.namprd03.prod.outlook.com (10.162.113.177) by CY1PR0301MB1194.namprd03.prod.outlook.com (10.160.165.25) with Microsoft SMTP Server (TLS) id 15.1.219.17; Tue, 21 Jul 2015 09:49:52 +0000 Received: from BL2FFO11FD011.protection.gbl (2a01:111:f400:7c09::147) by BLUPR0301CA0039.outlook.office365.com (2a01:111:e400:5259::49) with Microsoft SMTP Server (TLS) id 15.1.219.17 via Frontend Transport; Tue, 21 Jul 2015 09:49:51 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD011.mail.protection.outlook.com (10.173.161.17) with Microsoft SMTP Server (TLS) id 15.1.213.8 via Frontend Transport; Tue, 21 Jul 2015 09:49:51 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id t6L9nmc6020670; Tue, 21 Jul 2015 02:49:49 -0700 From: Yangbo Lu To: , , , Subject: [PATCH 1/3] mmc: sdhci-of-esdhc: convert to use esdhc_get_property() Date: Tue, 21 Jul 2015 17:44:54 +0800 Message-ID: <1437471894-34110-1-git-send-email-yangbo.lu@freescale.com> X-Mailer: git-send-email 2.1.0.27.g96db324 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD011; 1:CpT2T4SyXWqpLu4eivWiz5mqjlLh+3BbjsyzH9T4UZkpiIevxZieUIyogdXlO8a51fTBOvky0HCoRHFyUsEwPSiJ9LV9i6m3npgHCz20mqsZQ9Y9HXzhoDy/RqdTaaiLqq8OGoDTMj+MHiGGgYI2vvqVmryUE5ChcPGUcU7WqbBvNYy1CS1EHnD7hsfumvWMg+fmjnv7u6CPvRjDV8Z+G43ZkcHd9gGdjm+g/UL3LMAtNsJ+MOv5diB7gPw1DRk6gj9WdHEif6y4hrMkSwN/acq3MOAa7ahmyxSDBHu/xcjC81evHsFDU5SRibrKsH03k2gWtWt45uHIr7Y8xc9mrEwq5+DNxJeXBs9oqxP4DrjkyCWAJesSwP7w5Ul2tFxrQFqYlUskA5QdZzcKhF9FOE50MmaW+gC/VDJduxRBfL4vx0sVOd9kWYk9q7hQ8RwB X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(339900001)(189002)(199003)(19580405001)(6806004)(50986999)(62966003)(77156002)(46102003)(105606002)(92566002)(85426001)(106466001)(230783001)(19580395003)(36756003)(2201001)(5003940100001)(87936001)(107886002)(5001960100002)(86362001)(50226001)(47776003)(77096005)(189998001)(48376002)(33646002)(104016003)(50466002)(5001770100001)(5001920100001)(229853001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR0301MB1194; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:sfv; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1194; 2:yDIat+xwiFvOdidtqwPg4NLd6C5SwKoQI6cKDDixd8/SIUz7Ki5w+7SyLCdecgLA; 3:5JkVjSHTjM/YZcWtEcs/vxa2nnv7WmINgFCyGZAd0usc3DIEiKlpa32BTQQzHw81XU6meC0booPFI2JEQNz6j9dSAYgDGIfHx6bJO974TpSZhDxxyYVQnshUWql4Fje3xyyL04nZyrleS4qd21tx42jp1pRLCfpBxGPwAP3qxD3PIEYM6KWv3kYyNFtW1wLSO9Vxvktz2q8NpJekkOrd3MaBi+kNhNodO6Z5SRiwwTM=; 25:ql3HkCyhoEjnACgl3sr1T6XqkPeE+xbbEwfe7NtMX9oSw7yhyfXaYa+9HabMZ9Z0e6nNhs1fKxXuJOSql3dvP0K1e9uyTFxAWspRe6udIs87qTln0Wh+DzbEr73t3n3Tf7GTckbxRRp4elcAGfxGRj1Q0oD41HfZgcaop+Fo5mtzSGzCOVHtLR3nidxBTAUPqdpcPpxq5RmrYa5barLb1I8UrNn8yS1j2BeACPxkMtT1S0j2ct2cUtmvR3HCuNUtRmF4zqNRv+f/5ISNZ5xz8Q==; 20:C3mWbwfntEDoZO6gpwGyjY/UJuBttLB8YK6KdaAVQtRhOpQbRU8CxGc0fyJVgdqTtfqmMa/xV6rg3s9Pp6XF01lwep/pLEUH+cf/OA92kB9LxYD4t9n1euWiYmbWoVILKR8Oj8lRj9q2vWloLEw2js2Om5hijT3aYISdNoFgiPiG7kakhEwQeTAWZqboXk6qM8R+VS5IJrTF83N2iVeyJ5B7VvUJb7az8dYyxUvQsEJdhaBTsPZzu+asiEuJJJXW1K5jAeQl1/zhAjhNl7f8eXJGgSz3macPtUJMq2aPpSUKpavRwNpUy/TqcFJobv4vkWCuIaNiIOXWMfz9sdXEifWVXclBdiGYyL0AYN9Q8dU= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1194; CY1PR0301MB1194: X-MS-Exchange-Organization-RulesExecuted X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:CY1PR0301MB1194; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0301MB1194; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1194; 4:N29+68ydus4EbWxb5i3WIa1jm/TeFaxTFJSL0RBuExW1fSEsSJQ04SBj/AfWeuiOJrecUMP+Q3W3NhGfsDaj3Jbl2PWYEzUbLodLjs4N6biikcbymLsJnsrLUlrG1s54kv1WnKp/awK03Mg9RKpD4YxRBVnOrWl4JGkVoBVsEYLSA2kGUM7OC0K8JW8/N9NJxTBM9LK7wpAZknEw3R+YAOhFWsuf+L3u/f5OPtsDrPnI6LzKzf/ddRYsvGw664ZJtmARaQt9va9SZt2xbM5cjGHr2q7Z9t0dIuBOesZ1sM0= X-Forefront-PRVS: 0644578634 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB1194; 23:ksxkJQwpzXkthWQwY/uVN7iZzDedvGmlfGg+KDc?= =?us-ascii?Q?iXx5XEeuDfU/9rLt8FoB00FRuJTlXQ0lxPOQstVyWVLqY+tTR+BxMPG8UDpx?= =?us-ascii?Q?Cq1Czne2agEf0ky1L28bDvUSrr8TW/flmYATcGxRmKCmVeOzV7ya55JApdy2?= =?us-ascii?Q?+wx3qPQCcgR2HtIdAWoUwIlAPnj1CPK3VYzG/5f474guSWiYTvCtL6dQLYsL?= =?us-ascii?Q?vEC2nsk6jXJ+pahz2Xpo/YiS2xmyVAcDz0XdB1iFl77O3hfJ8hKHtf1KW/0F?= =?us-ascii?Q?PVIpYKxDV40xE/x4bmESR/mltQgmyASJe+cQucNIqw9rgjmnfxCVlkH6ThRQ?= =?us-ascii?Q?GiItNE66dBxSzWXB0P85jez/Omyy2VrHvwKfLkB+6RdIHK3bwIXSO+YD4qfv?= =?us-ascii?Q?+lgnCeolspE2afLIxOskhycEjxDOkQgscOcbValjb96qaLViXIjbrzJfo02x?= =?us-ascii?Q?dR9+h9MJUvyibelKhCCAevREojNnr4RoKDN9nMpxYu3FMxO1Rq4FDxJQpRS3?= =?us-ascii?Q?btawm/BaDtg2H7EuHe1eBZAgQx9KIH5HIsUwMLZy5XZJ++aVv37tbCDh2Cl/?= =?us-ascii?Q?E7bwm1szr6hJfBCsGypDZGWb5Fu/R6pIMPx2cSAML/zk1nQhNsTiYCp5pu9p?= =?us-ascii?Q?+hIzCoB5Pd9pHXNIaewzs8oJufPk0UPq62Ca8mk2B/vqlFVp3fIroidjKcwD?= =?us-ascii?Q?gca8gMxxNfoODVqxHQM8hYgmI11tP8EM4rI5UG5HI2b958HM+wu61zyeyYuM?= =?us-ascii?Q?9px2Upr+vGD8yfk7SuPPGObrBD101Lq7oSVH83YZBrtvfs5JyJTxlYREDU8X?= =?us-ascii?Q?XE3f8prWM21/p3eyhJg1H/6aTy0cyG0f7KFsyZZXXOsJkJljZU2z1iphVw9Y?= =?us-ascii?Q?x+TpZQ1HvTI+KTThCQ+iN8UzkFywtgdBTwe55PQKqIPW2bYnpNtFpWcRUE1v?= =?us-ascii?Q?9ZltnoTPhu1lUDruCcL/UClxrO1/FXs9NrI2UBZNXukHp7XN7tTA8hqktuAj?= =?us-ascii?Q?VqKY=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1194; 5:cHv7tb8EFg3BrA4whMzdFRiG2z/9NYt3Mma8WU2Z4RdUDotG6xDeWf4m1uH0kuoh6A3CX/wjb7KPs2FPQKAC4g3qUJWSsOsbP3dTgkjo5a5vlgfdQUgFM03cx5ycuhovE7f76xNjZ1bB5q6HWqb0xQ==; 24:oO4R/aP1SQd3NGFwY7p8A99QN/tQffOVqYoGQVtm1nIlsRcFj82QEfKMcv1CVIarQUKkRUwxiWfsnmZF8JcD2eHoiljuajKbSjWUOY2PfvM=; 20:e4h7XLsImbeB3kuEVd7Tzfjfr4PpAQIw0bsvOxr4xXWsOiQxB6vOSIzv+7G0/SiYRSL6Jfmq0Z80KJhinYPu8Q== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2015 09:49:51.5407 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB1194 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yangbo Lu Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Move sdhci_get_of_property and other getting property code from sdhci_esdhc_probe into esdhc_get_property. Signed-off-by: Yangbo Lu --- drivers/mmc/host/sdhci-of-esdhc.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c index 797be75..1295a96 100644 --- a/drivers/mmc/host/sdhci-of-esdhc.c +++ b/drivers/mmc/host/sdhci-of-esdhc.c @@ -348,19 +348,17 @@ static const struct sdhci_pltfm_data sdhci_esdhc_pdata = { .ops = &sdhci_esdhc_ops, }; -static int sdhci_esdhc_probe(struct platform_device *pdev) +static void esdhc_get_property(struct platform_device *pdev) { - struct sdhci_host *host; - struct device_node *np; - int ret; - - host = sdhci_pltfm_init(pdev, &sdhci_esdhc_pdata, 0); - if (IS_ERR(host)) - return PTR_ERR(host); + struct device_node *np = pdev->dev.of_node; + struct sdhci_host *host = platform_get_drvdata(pdev); sdhci_get_of_property(pdev); - np = pdev->dev.of_node; + /* call to generic mmc_of_parse to support additional capabilities */ + mmc_of_parse(host->mmc); + mmc_of_parse_voltage(np, &host->ocr_mask); + if (of_device_is_compatible(np, "fsl,p5040-esdhc") || of_device_is_compatible(np, "fsl,p5020-esdhc") || of_device_is_compatible(np, "fsl,p4080-esdhc") || @@ -375,13 +373,18 @@ static int sdhci_esdhc_probe(struct platform_device *pdev) */ host->quirks2 |= SDHCI_QUIRK2_BROKEN_HOST_CONTROL; } +} - /* call to generic mmc_of_parse to support additional capabilities */ - ret = mmc_of_parse(host->mmc); - if (ret) - goto err; +static int sdhci_esdhc_probe(struct platform_device *pdev) +{ + struct sdhci_host *host; + int ret; - mmc_of_parse_voltage(np, &host->ocr_mask); + host = sdhci_pltfm_init(pdev, &sdhci_esdhc_pdata, 0); + if (IS_ERR(host)) + return PTR_ERR(host); + + esdhc_get_property(pdev); ret = sdhci_add_host(host); if (ret)