From patchwork Wed Jun 2 20:08:39 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Likely X-Patchwork-Id: 54426 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-pz0-f137.google.com (mail-pz0-f137.google.com [209.85.222.137]) by ozlabs.org (Postfix) with ESMTP id BCC75B7D48 for ; Thu, 3 Jun 2010 06:08:46 +1000 (EST) Received: by pzk1 with SMTP id 1sf274281pzk.11 for ; Wed, 02 Jun 2010 13:08:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=beta; h=domainkey-signature:received:x-beenthere:received:received:received :received:received-spf:received:received:received:sender:received :subject:from:cc:date:message-id:user-agent:mime-version :x-original-authentication-results:x-original-sender:reply-to :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe:content-type; bh=fs8r1+d74Bmn/pPm1gSdTRanGtqNoaNWbfhfkKJB02s=; b=7Kjd06LvJBJG+JVb6Xi39/jrxHU+CZh2KlW02sRrLqWGLUQjbAefuJy3/MThxKlHZA btxiaN9tbKkIuXB4Pt6Lpmxn6QOft3LJMRHVn2Q0XfQZNk6i+LFeHiiHID7hyMAiSQLw fbogdEqJptDJk4ae2RIiMUVnjjoSXKIeTOlvw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlegroups.com; s=beta; h=x-beenthere:received-spf:sender:subject:from:cc:date:message-id :user-agent:mime-version:x-original-authentication-results :x-original-sender:reply-to:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe :content-type; b=FJl31gEGIrnMYWGdtnE6WeOYDr1kK96xAJoVuvcmHQ1y5kGQg6Ywgz7JHkCClJdl6P hIQNOK7oQaEks5NEe60YZNLMUNnCW6km9XyWMjZuhr0SX2zRJewxwKbpKyW0zoztoxDt MMW0jsCQNc0/eoFFppLh6cCLEegMLpV+zQG8o= Received: by 10.141.187.38 with SMTP id o38mr820250rvp.24.1275509324655; Wed, 02 Jun 2010 13:08:44 -0700 (PDT) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.141.13.11 with SMTP id q11ls4365319rvi.3.p; Wed, 02 Jun 2010 13:08:42 -0700 (PDT) Received: by 10.141.131.19 with SMTP id i19mr2850428rvn.23.1275509322833; Wed, 02 Jun 2010 13:08:42 -0700 (PDT) Received: by 10.141.131.19 with SMTP id i19mr2850427rvn.23.1275509322810; Wed, 02 Jun 2010 13:08:42 -0700 (PDT) Received: from mail-pw0-f51.google.com (mail-pw0-f51.google.com [209.85.160.51]) by gmr-mx.google.com with ESMTP id b2si354222rvn.1.2010.06.02.13.08.42; Wed, 02 Jun 2010 13:08:42 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.51 is neither permitted nor denied by best guess record for domain of grant.likely@secretlab.ca) client-ip=209.85.160.51; Received: by mail-pw0-f51.google.com with SMTP id 9so2443689pwj.10 for ; Wed, 02 Jun 2010 13:08:42 -0700 (PDT) Received: by 10.142.2.2 with SMTP id 2mr5426244wfb.75.1275509322532; Wed, 02 Jun 2010 13:08:42 -0700 (PDT) Received: from angua (S01060002b3d79728.cg.shawcable.net [70.72.87.49]) by mx.google.com with ESMTPS id u34sm2406031wfh.8.2010.06.02.13.08.40 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 02 Jun 2010 13:08:41 -0700 (PDT) Sender: rtc-linux@googlegroups.com Received: from [127.0.1.1] (unknown [IPv6:::1]) by angua (Postfix) with ESMTP id E4E2D3C0110; Wed, 2 Jun 2010 14:08:39 -0600 (MDT) Subject: [rtc-linux] [PATCH] of/rtc: rtc-mpc5121.c: Fix build failures From: Grant Likely Cc: Paul Gortmaker , Wolfgang Denk , rtc-linux@googlegroups.com, Alessandro Zummo , devicetree-discuss@lists.ozlabs.org, Tejun Heo , Anatolij Gustschin Date: Wed, 02 Jun 2010 14:08:39 -0600 Message-ID: <20100602200826.10331.23002.stgit@angua> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 209.85.160.51 is neither permitted nor denied by best guess record for domain of grant.likely@secretlab.ca) smtp.mail=grant.likely@secretlab.ca X-Original-Sender: glikely@secretlab.ca Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: List-Post: , List-Help: , List-Archive: List-Subscribe: , List-Unsubscribe: , Fixes build errors caused by the: - OF device_node pointer being moved into struct device - removal of the match_table field from struct of_platform_driver Signed-off-by: Grant Likely CC: Paul Gortmaker CC: Alessandro Zummo CC: Wolfgang Denk CC: Tejun Heo CC: Anatolij Gustschin CC: rtc-linux@googlegroups.com CC: devicetree-discuss@lists.ozlabs.org --- I've applied this patch to my merge-devicetree branch drivers/rtc/rtc-mpc5121.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/rtc/rtc-mpc5121.c b/drivers/rtc/rtc-mpc5121.c index f0dbf9c..db5d8c4 100644 --- a/drivers/rtc/rtc-mpc5121.c +++ b/drivers/rtc/rtc-mpc5121.c @@ -279,7 +279,7 @@ static int __devinit mpc5121_rtc_probe(struct of_device *op, if (!rtc) return -ENOMEM; - rtc->regs = of_iomap(op->node, 0); + rtc->regs = of_iomap(op->dev.of_node, 0); if (!rtc->regs) { dev_err(&op->dev, "%s: couldn't map io space\n", __func__); err = -ENOSYS; @@ -290,7 +290,7 @@ static int __devinit mpc5121_rtc_probe(struct of_device *op, dev_set_drvdata(&op->dev, rtc); - rtc->irq = irq_of_parse_and_map(op->node, 1); + rtc->irq = irq_of_parse_and_map(op->dev.of_node, 1); err = request_irq(rtc->irq, mpc5121_rtc_handler, IRQF_DISABLED, "mpc5121-rtc", &op->dev); if (err) { @@ -299,7 +299,7 @@ static int __devinit mpc5121_rtc_probe(struct of_device *op, goto out_dispose; } - rtc->irq_periodic = irq_of_parse_and_map(op->node, 0); + rtc->irq_periodic = irq_of_parse_and_map(op->dev.of_node, 0); err = request_irq(rtc->irq_periodic, mpc5121_rtc_handler_upd, IRQF_DISABLED, "mpc5121-rtc_upd", &op->dev); if (err) { @@ -365,9 +365,11 @@ static struct of_device_id mpc5121_rtc_match[] __devinitdata = { }; static struct of_platform_driver mpc5121_rtc_driver = { - .owner = THIS_MODULE, - .name = "mpc5121-rtc", - .match_table = mpc5121_rtc_match, + .driver = { + .name = "mpc5121-rtc", + .owner = THIS_MODULE, + .of_match_table = mpc5121_rtc_match, + }, .probe = mpc5121_rtc_probe, .remove = __devexit_p(mpc5121_rtc_remove), };