From: Andrew Lunn <andrew@lunn.ch>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jingoo Han <jg1.han@samsung.com>, Andrew Lunn <andrew@lunn.ch>,
Jason Cooper <jason@lakedaemon.net>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org
Subject: Re: linux-next: manual merge of the akpm tree with the arm-soc tree
Date: Tue, 12 Mar 2013 07:25:09 +0100 [thread overview]
Message-ID: <20130312062509.GQ21478@lunn.ch> (raw)
In-Reply-To: <20130312144714.39749c5b0bd1aea14c4d2ff8@canb.auug.org.au>
On Tue, Mar 12, 2013 at 02:47:14PM +1100, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in
> drivers/rtc/rtc-mv.c between commit 89c58c198b25 ("rtc: rtc-mv: Add
> support for clk to avoid lockups") from the arm-soc tree and commit "rtc:
> rtc-mv: use devm_rtc_device_register()" from the akpm tree.
>
> I fixed it up (I think - see below) and can carry the fix as necessary
> (no action is required).
Hi Stephan
Looks O.K. to me.
Acked-by: Andrew Lunn <andrew@lunn.ch>
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/rtc/rtc-mv.c
> index f378e17,1ee8551..0000000
> --- a/drivers/rtc/rtc-mv.c
> +++ b/drivers/rtc/rtc-mv.c
> @@@ -272,16 -262,15 +272,17 @@@ static int __init mv_rtc_probe(struct p
>
> if (pdata->irq >= 0) {
> device_init_wakeup(&pdev->dev, 1);
> - pdata->rtc = rtc_device_register(pdev->name, &pdev->dev,
> + pdata->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
> &mv_rtc_alarm_ops,
> THIS_MODULE);
> - } else
> - pdata->rtc = rtc_device_register(pdev->name, &pdev->dev,
> + } else {
> + pdata->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
> &mv_rtc_ops, THIS_MODULE);
> + }
> - if (IS_ERR(pdata->rtc))
> - return PTR_ERR(pdata->rtc);
> + if (IS_ERR(pdata->rtc)) {
> + ret = PTR_ERR(pdata->rtc);
> + goto out;
> + }
>
> if (pdata->irq >= 0) {
> writel(0, pdata->ioaddr + RTC_ALARM_INTERRUPT_MASK_REG_OFFS);
> @@@ -308,10 -292,6 +309,9 @@@ static int __exit mv_rtc_remove(struct
> if (pdata->irq >= 0)
> device_init_wakeup(&pdev->dev, 0);
>
> - rtc_device_unregister(pdata->rtc);
> + if (!IS_ERR(pdata->clk))
> + clk_disable_unprepare(pdata->clk);
> +
> return 0;
> }
>
next prev parent reply other threads:[~2013-03-12 6:25 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-12 3:47 linux-next: manual merge of the akpm tree with the arm-soc tree Stephen Rothwell
2013-03-12 6:25 ` Andrew Lunn [this message]
2013-03-12 11:12 ` Jason Cooper
2013-03-12 11:37 ` Olof Johansson
2013-03-12 11:53 ` Jason Cooper
2013-03-12 12:48 ` Arnd Bergmann
2013-03-12 13:32 ` Jason Cooper
2013-03-12 20:20 ` Andrew Morton
-- strict thread matches above, loose matches on Subject: below --
2013-06-21 7:36 Stephen Rothwell
2013-06-21 7:33 Stephen Rothwell
2012-05-17 7:18 Stephen Rothwell
2012-05-14 9:24 Stephen Rothwell
2012-05-14 21:57 ` Turquette, Mike
2012-02-29 6:21 Stephen Rothwell
2012-02-29 6:32 ` Yong Zhang
2012-02-29 6:54 ` Haojian Zhuang
2012-02-29 7:11 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130312062509.GQ21478@lunn.ch \
--to=andrew@lunn.ch \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=jason@lakedaemon.net \
--cc=jg1.han@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).