From patchwork Mon May 30 20:34:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Stuebner X-Patchwork-Id: 830882 Received: from bombadil.infradead.org (173-166-109-252-newengland.hfc.comcastbusiness.net [173.166.109.252]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4UKd1uf016541 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 30 May 2011 20:39:24 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by bombadil.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QR9Ao-0001Wv-41; Mon, 30 May 2011 20:34:50 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QR9Ak-0003Xs-5Y; Mon, 30 May 2011 20:34:46 +0000 Received: from s15407518.onlinehome-server.info ([82.165.136.167]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QR9Ag-0003XY-Tl for linux-arm-kernel@lists.infradead.org; Mon, 30 May 2011 20:34:43 +0000 Received: from 91-64-162-199-dynip.superkabel.de ([91.64.162.199] helo=marty.localnet) by s15407518.onlinehome-server.info with esmtpa (Exim 4.69) (envelope-from ) id 1QR9Aa-00009P-VA; Mon, 30 May 2011 22:34:37 +0200 From: Heiko =?iso-8859-1?q?St=FCbner?= To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH] Fix compile failures by syscore_ops change on s3c2416 Date: Mon, 30 May 2011 22:34:35 +0200 User-Agent: KMail/1.13.5 (Linux/2.6.37-2-686; KDE/4.4.5; i686; ; ) MIME-Version: 1.0 Message-Id: <201105302234.35749.heiko@sntech.de> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110530_163443_146549_453A603C X-CRM114-Status: GOOD ( 11.91 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- Cc: "Rafael J. Wysocki" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 30 May 2011 20:39:25 +0000 (UTC) s3c24xx_irq_syscore_ops is only defined in mach-s3c2410/irq.c which is not used by s3c2416. Also s3c2410_dma_chan needs a struct prefix --- It feels wrong to put a double of s3c24xx_irq_syscore_ops in another file, but I haven't found a better place for the whole thing yet. Might plat-s3c24xx/irq-pm.c be better suited to host s3c24xx_irq_syscore_ops for all s3c-socs? arch/arm/mach-s3c2416/irq.c | 6 ++++++ arch/arm/plat-s3c24xx/dma.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-s3c2416/irq.c b/arch/arm/mach-s3c2416/irq.c index 28ad20d..a2c49fa 100644 --- a/arch/arm/mach-s3c2416/irq.c +++ b/arch/arm/mach-s3c2416/irq.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -238,6 +239,11 @@ static struct sysdev_driver s3c2416_irq_driver = { .add = s3c2416_irq_add, }; +struct syscore_ops s3c24xx_irq_syscore_ops = { + .suspend = s3c24xx_irq_suspend, + .resume = s3c24xx_irq_resume, +}; + static int __init s3c2416_irq_init(void) { return sysdev_driver_register(&s3c2416_sysclass, &s3c2416_irq_driver); diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c index c10d10c..2abf966 100644 --- a/arch/arm/plat-s3c24xx/dma.c +++ b/arch/arm/plat-s3c24xx/dma.c @@ -1199,7 +1199,7 @@ EXPORT_SYMBOL(s3c2410_dma_getposition); #ifdef CONFIG_PM -static void s3c2410_dma_suspend_chan(s3c2410_dma_chan *cp) +static void s3c2410_dma_suspend_chan(struct s3c2410_dma_chan *cp) { printk(KERN_DEBUG "suspending dma channel %d\n", cp->number);