From patchwork Wed Nov 28 09:24:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 1814531 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 63C0840E13 for ; Wed, 28 Nov 2012 09:24:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753755Ab2K1JYe (ORCPT ); Wed, 28 Nov 2012 04:24:34 -0500 Received: from moutng.kundenserver.de ([212.227.17.8]:65158 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753740Ab2K1JYa (ORCPT ); Wed, 28 Nov 2012 04:24:30 -0500 Received: from axis700.grange (dslb-178-006-249-114.pools.arcor-ip.net [178.6.249.114]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0MKMb4-1Td6BJ2DBu-001Jcq; Wed, 28 Nov 2012 10:24:27 +0100 Received: by axis700.grange (Postfix, from userid 1000) id 2EC3F40B99; Wed, 28 Nov 2012 10:24:27 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id 2C8D640B98; Wed, 28 Nov 2012 10:24:27 +0100 (CET) Date: Wed, 28 Nov 2012 10:24:27 +0100 (CET) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: linux-mmc@vger.kernel.org cc: linux-sh@vger.kernel.org, Chris Ball Subject: [PATCH] mmc: sh_mmcif: remove unneeded clock connection ID Message-ID: MIME-Version: 1.0 X-Provags-ID: V02:K0:4XlaoZICpDNEtyjthSHCm7pO4oj66IMdg+zwfTM7wnb GTfRRURNVO+hFsSnVVi1uO9zqpekI+t6e1WIEFFoeE8Zx3H9Zw TqU489t3iO0xOR3ldOh7b51RlXmdeIl0cqX3MWnmOXqbFd/Rgg NOG0CqNrVxmzBgS/fb7Jn4FahCZLwyXaRu+Bw/skwdJTH/Y/to p5/GJ1HIHyeAgdtrYxqSuNacIqdBX1naQ6URzie6Cc46yhB2YA A5kAA97DL9x83kLOeXTnRBssgAIEvw3+rbrLb2+3BobYJUu2zu ZHFiPFLPWcbntNl3QGroUQ9dsoPhLFHrMheM/XcmfBkdSm+fHd HmLBfu+cag/ThrJIF71Yw0AL1ub+GfAd7KbCGUhSjGz3A1Id11 2vsEegY8Svisg== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org MMCIF only uses one clock, all ARM and SuperH platforms register MMCIF clock lookup entries with no connection ID, hence it can be dropped in the driver too. Signed-off-by: Guennadi Liakhovetski Reviewed-by: Simon Horman --- drivers/mmc/host/sh_mmcif.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c index d25bc97..358295e 100644 --- a/drivers/mmc/host/sh_mmcif.c +++ b/drivers/mmc/host/sh_mmcif.c @@ -1310,7 +1310,6 @@ static int __devinit sh_mmcif_probe(struct platform_device *pdev) struct sh_mmcif_plat_data *pd = pdev->dev.platform_data; struct resource *res; void __iomem *reg; - char clk_name[8]; irq[0] = platform_get_irq(pdev, 0); irq[1] = platform_get_irq(pdev, 1); @@ -1360,11 +1359,10 @@ static int __devinit sh_mmcif_probe(struct platform_device *pdev) pm_runtime_enable(&pdev->dev); host->power = false; - snprintf(clk_name, sizeof(clk_name), "mmc%d", pdev->id); - host->hclk = clk_get(&pdev->dev, clk_name); + host->hclk = clk_get(&pdev->dev, NULL); if (IS_ERR(host->hclk)) { ret = PTR_ERR(host->hclk); - dev_err(&pdev->dev, "cannot get clock \"%s\": %d\n", clk_name, ret); + dev_err(&pdev->dev, "cannot get clock: %d\n", ret); goto eclkget; } ret = sh_mmcif_clk_update(host);