From patchwork Wed May 9 12:50:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sangwook X-Patchwork-Id: 8495 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 8227123E20 for ; Wed, 9 May 2012 12:52:37 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id 4546DA18732 for ; Wed, 9 May 2012 12:52:37 +0000 (UTC) Received: by yhpp61 with SMTP id p61so259418yhp.11 for ; Wed, 09 May 2012 05:52:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=Z3t3TAiMm61qCtAfEd7XUKoPLYutH51Y9wTRUXW9fBY=; b=n3B/29XHd1P3xjXb9BAzk74qu24O52cdpGOF85YBXZUStAYN6djUZkHYHGUzGO7Knr YPr3OeQKLp/ZxQjqYPNkvfLb4Xz5jaE/5uwe1Ts2MoaMhyXrllxWHb+PPCge8jdCQCKn quAc2ZdvPlnMpp4pYvlaE4LURU8VkMwCWIB4pyXcOgduaOfQYsqEwMTynqz/i1wDOguf EhfVqlsl64hg9S7FdUV1jrH/R3fprDzR4kSmQnoYEuGqxrDi8LyC8k1C8Ptlk51l767z P/1aWgYyXMi28cdWfrlQNyUx31ckaXCZRXO1yWNNL39UTmDxU0+8s8wv2VVrfJsd+JQU HG6g== Received: by 10.42.139.9 with SMTP id e9mr338525icu.43.1336567956596; Wed, 09 May 2012 05:52:36 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.73.147 with SMTP id q19csp13215ibj; Wed, 9 May 2012 05:52:35 -0700 (PDT) Received: by 10.204.156.220 with SMTP id y28mr1178918bkw.37.1336567955088; Wed, 09 May 2012 05:52:35 -0700 (PDT) Received: from mail-bk0-f50.google.com (mail-bk0-f50.google.com [209.85.214.50]) by mx.google.com with ESMTPS id iu12si1528861bkc.54.2012.05.09.05.52.34 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 09 May 2012 05:52:35 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.214.50 is neither permitted nor denied by best guess record for domain of sangwook.lee@linaro.org) client-ip=209.85.214.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.214.50 is neither permitted nor denied by best guess record for domain of sangwook.lee@linaro.org) smtp.mail=sangwook.lee@linaro.org Received: by bkcjg9 with SMTP id jg9so295954bkc.37 for ; Wed, 09 May 2012 05:52:34 -0700 (PDT) Received: by 10.204.154.83 with SMTP id n19mr8216988bkw.69.1336567954263; Wed, 09 May 2012 05:52:34 -0700 (PDT) Received: from localhost.localdomain (host86-148-122-8.range86-148.btcentralplus.com. [86.148.122.8]) by mx.google.com with ESMTPS id z14sm4941980bky.15.2012.05.09.05.52.32 (version=SSLv3 cipher=OTHER); Wed, 09 May 2012 05:52:33 -0700 (PDT) From: Sangwook Lee To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Cc: kgene.kim@samsung.com, linux@arm.linux.org.uk, linaro-dev@lists.linaro.org, patches@linaro.org, Sangwook Lee Subject: [PATCH] ARM: EXYNOS: PD: Fix duplicate variable Date: Wed, 9 May 2012 13:50:28 +0100 Message-Id: <1336567828-9967-1-git-send-email-sangwook.lee@linaro.org> X-Mailer: git-send-email 1.7.4.1 X-Gm-Message-State: ALoCoQlGeiwwyWBBKok4zZm0/E0lYmSt1HUwsUurRJqI2XC90BRi1mlHYpWV+3Yex9Ciq3ii1xVU struct generic_pm_domain already has a field for name. Use that field instead of creating another field in struct exynos_pm_domain Signed-off-by: Sangwook Lee --- arch/arm/mach-exynos/pm_domains.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-exynos/pm_domains.c b/arch/arm/mach-exynos/pm_domains.c index 13b3068..4d2563c 100644 --- a/arch/arm/mach-exynos/pm_domains.c +++ b/arch/arm/mach-exynos/pm_domains.c @@ -28,7 +28,6 @@ */ struct exynos_pm_domain { void __iomem *base; - char const *name; bool is_off; struct generic_pm_domain pd; }; @@ -75,10 +74,10 @@ static int exynos_pd_power_off(struct generic_pm_domain *domain) #define EXYNOS_GPD(PD, BASE, NAME) \ static struct exynos_pm_domain PD = { \ .base = (void __iomem *)BASE, \ - .name = NAME, \ .pd = { \ .power_off = exynos_pd_power_off, \ .power_on = exynos_pd_power_on, \ + .name = NAME, \ }, \ } @@ -99,7 +98,7 @@ static __init int exynos_pm_dt_parse_domains(void) if (of_get_property(np, "samsung,exynos4210-pd-off", NULL)) pd->is_off = true; - pd->name = np->name; + pd->pd.name = (char *)np->name; pd->base = of_iomap(np, 0); pd->pd.power_off = exynos_pd_power_off; pd->pd.power_on = exynos_pd_power_on; @@ -122,7 +121,7 @@ static __init void exynos_pm_add_dev_to_genpd(struct platform_device *pdev, if (pm_genpd_add_device(&pd->pd, &pdev->dev)) pr_info("%s: error in adding %s device to %s power" "domain\n", __func__, dev_name(&pdev->dev), - pd->name); + pd->pd.name); } }