From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932088Ab2HFXLS (ORCPT ); Mon, 6 Aug 2012 19:11:18 -0400 Received: from ogre.sisk.pl ([193.178.161.156]:44947 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756424Ab2HFXLN (ORCPT ); Mon, 6 Aug 2012 19:11:13 -0400 From: "Rafael J. Wysocki" To: "Linux-sh list" Subject: [PATCH 3/12] ARM: shmobile: Drop r8a7779_add_device_to_domain() Date: Tue, 7 Aug 2012 01:07:46 +0200 User-Agent: KMail/1.13.6 (Linux/3.5.0+; KDE/4.6.0; x86_64; ; ) Cc: LKML , Linux PM list , Magnus Damm References: <201208070105.23262.rjw@sisk.pl> In-Reply-To: <201208070105.23262.rjw@sisk.pl> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201208070107.46751.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If the r8a7779's PM domains are given names, this SoC and its boards will be able to use rmobile_add_device_to_domain() for adding devices to those domains and r8a7779_add_device_to_domain(), which is not used anywhere at the moment anyway, may be dopped. Accordingly, give names to the r8a7779's PM domains and drop r8a7779_add_device_to_domain(). Signed-off-by: Rafael J. Wysocki --- arch/arm/mach-shmobile/include/mach/r8a7779.h | 3 --- arch/arm/mach-shmobile/pm-r8a7779.c | 14 ++++---------- 2 files changed, 4 insertions(+), 13 deletions(-) Index: linux/arch/arm/mach-shmobile/include/mach/r8a7779.h =================================================================== --- linux.orig/arch/arm/mach-shmobile/include/mach/r8a7779.h +++ linux/arch/arm/mach-shmobile/include/mach/r8a7779.h @@ -353,11 +353,8 @@ extern struct r8a7779_pm_domain r8a7779_ extern struct r8a7779_pm_domain r8a7779_impx3; extern void r8a7779_init_pm_domain(struct r8a7779_pm_domain *r8a7779_pd); -extern void r8a7779_add_device_to_domain(struct r8a7779_pm_domain *r8a7779_pd, - struct platform_device *pdev); #else #define r8a7779_init_pm_domain(pd) do { } while (0) -#define r8a7779_add_device_to_domain(pd, pdev) do { } while (0) #endif /* CONFIG_PM */ #endif /* __ASM_R8A7779_H__ */ Index: linux/arch/arm/mach-shmobile/pm-r8a7779.c =================================================================== --- linux.orig/arch/arm/mach-shmobile/pm-r8a7779.c +++ linux/arch/arm/mach-shmobile/pm-r8a7779.c @@ -199,17 +199,8 @@ void r8a7779_init_pm_domain(struct r8a77 pd_power_up(&r8a7779_pd->genpd); } -void r8a7779_add_device_to_domain(struct r8a7779_pm_domain *r8a7779_pd, - struct platform_device *pdev) -{ - struct device *dev = &pdev->dev; - - pm_genpd_add_device(&r8a7779_pd->genpd, dev); - if (pm_clk_no_clocks(dev)) - pm_clk_add(dev, NULL); -} - struct r8a7779_pm_domain r8a7779_sh4a = { + .genpd_name = "SH4A", .ch = { .chan_offs = 0x80, /* PWRSR1 .. PWRER1 */ .isr_bit = 16, /* SH4A */ @@ -217,6 +208,7 @@ struct r8a7779_pm_domain r8a7779_sh4a = }; struct r8a7779_pm_domain r8a7779_sgx = { + .genpd_name = "SGX", .ch = { .chan_offs = 0xc0, /* PWRSR2 .. PWRER2 */ .isr_bit = 20, /* SGX */ @@ -224,6 +216,7 @@ struct r8a7779_pm_domain r8a7779_sgx = { }; struct r8a7779_pm_domain r8a7779_vdp1 = { + .genpd_name = "VDP1", .ch = { .chan_offs = 0x100, /* PWRSR3 .. PWRER3 */ .isr_bit = 21, /* VDP */ @@ -231,6 +224,7 @@ struct r8a7779_pm_domain r8a7779_vdp1 = }; struct r8a7779_pm_domain r8a7779_impx3 = { + .genpd_name = "IMPX3", .ch = { .chan_offs = 0x140, /* PWRSR4 .. PWRER4 */ .isr_bit = 24, /* IMP */