From patchwork Mon Aug 19 06:36:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuvaraj CD X-Patchwork-Id: 2846359 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 9D581BF546 for ; Mon, 19 Aug 2013 06:37:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 99278202AB for ; Mon, 19 Aug 2013 06:37:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B257B201FD for ; Mon, 19 Aug 2013 06:37:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751006Ab3HSGhE (ORCPT ); Mon, 19 Aug 2013 02:37:04 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:55962 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750997Ab3HSGhE (ORCPT ); Mon, 19 Aug 2013 02:37:04 -0400 Received: by mail-pa0-f46.google.com with SMTP id fa1so4240959pad.33 for ; Sun, 18 Aug 2013 23:37:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NsY4yIIiz/4zvIsZcD8UxP3dG20lvJZCfseXj+HYick=; b=G70vu9bhkpDMjyat3pVL6B5XtXSUD3nhrhA/RaybU2pHV+UfYEzPyscVMCTj446++5 oGFUP+JT35QExYBGMcKnJj5FoehSlDZx1aTtQULESf+KsYZ7MsuLI179WU52eU/WHjm7 7/+EZRwuwDE8VzjFXjREkHe/DjgaIMLM7bIbwPZy04WxHwHTClinHcBpdy9ahpoijlj1 A1iWMgLMWKdAcyFDy2g0pqTUeVG5XZiwCp5M4AOPhDiRGbh5VBvUQBhGLZ84MbdGmthV vt+5NmaOSsTIdBhUNqiCxKZ6vkd0ZM2XOpliTotRRsPfuo+q7CMb/MSgx6n9A2R8pJfj 3Nqw== X-Received: by 10.66.228.3 with SMTP id se3mr11849996pac.37.1376894223424; Sun, 18 Aug 2013 23:37:03 -0700 (PDT) Received: from yuvaraj-ubuntu.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id 7sm13575919paf.22.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 18 Aug 2013 23:37:02 -0700 (PDT) From: Yuvaraj Kumar C D To: cjb@laptop.org, jh80.chung@samsung.com, tgih.jun@samsung.com, linux-mmc@vger.kernel.org, thomas.ab@samsung.com Cc: Yuvaraj Kumar C D Subject: [RFC 2/3] mmc: dw_mmc: move the platform specific init call Date: Mon, 19 Aug 2013 12:06:15 +0530 Message-Id: <1376894176-2702-2-git-send-email-yuvaraj.cd@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1376894176-2702-1-git-send-email-yuvaraj.cd@samsung.com> References: <1376894176-2702-1-git-send-email-yuvaraj.cd@samsung.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 Current platform specific private data initialisation call dw_mci_exynos_priv_init can be used to do platform specific initialisation of SMU and others in future.So the drv_data->init call has moved to dw_mci_probe. Signed-off-by: Yuvaraj Kumar C D --- drivers/mmc/host/dw_mmc-pltfm.c | 7 ------- drivers/mmc/host/dw_mmc.c | 9 +++++++++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/mmc/host/dw_mmc-pltfm.c b/drivers/mmc/host/dw_mmc-pltfm.c index ee52556..a570da4 100644 --- a/drivers/mmc/host/dw_mmc-pltfm.c +++ b/drivers/mmc/host/dw_mmc-pltfm.c @@ -38,7 +38,6 @@ int dw_mci_pltfm_register(struct platform_device *pdev, { struct dw_mci *host; struct resource *regs; - int ret; host = devm_kzalloc(&pdev->dev, sizeof(struct dw_mci), GFP_KERNEL); if (!host) @@ -58,12 +57,6 @@ int dw_mci_pltfm_register(struct platform_device *pdev, if (IS_ERR(host->regs)) return PTR_ERR(host->regs); - if (drv_data && drv_data->init) { - ret = drv_data->init(host); - if (ret) - return ret; - } - platform_set_drvdata(pdev, host); return dw_mci_probe(host); } diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index ee5f167..0c0cada 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2222,6 +2222,15 @@ int dw_mci_probe(struct dw_mci *host) host->bus_hz = clk_get_rate(host->ciu_clk); } + if (drv_data && drv_data->init) { + ret = drv_data->init(host); + if (ret) { + dev_err(host->dev, + "implementation specific init failed\n"); + goto err_clk_ciu; + } + } + if (drv_data && drv_data->setup_clock) { ret = drv_data->setup_clock(host); if (ret) {