From: Tony Lindgren <tony@atomide.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org
Subject: Re: [GIT PULL] dmtimer changes for v3.2 merge window
Date: Mon, 3 Oct 2011 17:07:43 -0700 [thread overview]
Message-ID: <20111004000743.GM6324@atomide.com> (raw)
In-Reply-To: <2793025.zWgRvMbLEl@wuerfel>
* Arnd Bergmann <arnd@arndb.de> [111001 09:12]:
> On Friday 30 September 2011 22:13:42 Arnd Bergmann wrote:
> > On Thursday 29 September 2011, Tony Lindgren wrote:
> > > Please pull omap dmtimer changes from:
> > >
> > > git://github.com/tmlind/linux.git dmtimer
> > >
> > > This series completes the system timer separation from the
> > > driver like features. It also adds support for v2 ip that is
> > > available for some timers starting with omap4.
> > >
> > > After this series arch/arm/plat-omap/dmtimer.c could be
> > > moved to live under drivers somewhere, but there is still
> > > discussion going on which features should be supported in
> > > a generic way.
> > >
> > > This series depends on the cleanup you pulled earlier.
> > > As this series adds some new features like runtime PM suppport,
> > > I've kept it separate from cleanup.
> >
> > Looks really nice. I've put it into another top-level branch
> > named next/dmtimer for now. I'm open for suggestions on whether
> > I should generally push branches like this separately Linuswards
> > or better aggregate multiple standalone features into a single
> > branch.
>
> I'm adding the patch below to fix a trivial randconfig build regression
> in this series.
>
> Arnd
>
> 8<---
>
> Subject: [PATCH] ARM: omap: use __devexit_p in dmtimer driver
>
> The omap_dm_timer_remove function gets discarded when
> CONFIG_HOTPLUG is not set, so we must not reference it
> unconditionally.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Great, thanks!
Acked-by: Tony Lindgren <tony@atomide.com>
> diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
> index de7896f..2def4e1 100644
> --- a/arch/arm/plat-omap/dmtimer.c
> +++ b/arch/arm/plat-omap/dmtimer.c
> @@ -723,7 +723,7 @@ static int __devexit omap_dm_timer_remove(struct platform_device *pdev)
>
> static struct platform_driver omap_dm_timer_driver = {
> .probe = omap_dm_timer_probe,
> - .remove = omap_dm_timer_remove,
> + .remove = __devexit_p(omap_dm_timer_remove),
> .driver = {
> .name = "omap_timer",
> },
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] dmtimer changes for v3.2 merge window
Date: Mon, 3 Oct 2011 17:07:43 -0700 [thread overview]
Message-ID: <20111004000743.GM6324@atomide.com> (raw)
In-Reply-To: <2793025.zWgRvMbLEl@wuerfel>
* Arnd Bergmann <arnd@arndb.de> [111001 09:12]:
> On Friday 30 September 2011 22:13:42 Arnd Bergmann wrote:
> > On Thursday 29 September 2011, Tony Lindgren wrote:
> > > Please pull omap dmtimer changes from:
> > >
> > > git://github.com/tmlind/linux.git dmtimer
> > >
> > > This series completes the system timer separation from the
> > > driver like features. It also adds support for v2 ip that is
> > > available for some timers starting with omap4.
> > >
> > > After this series arch/arm/plat-omap/dmtimer.c could be
> > > moved to live under drivers somewhere, but there is still
> > > discussion going on which features should be supported in
> > > a generic way.
> > >
> > > This series depends on the cleanup you pulled earlier.
> > > As this series adds some new features like runtime PM suppport,
> > > I've kept it separate from cleanup.
> >
> > Looks really nice. I've put it into another top-level branch
> > named next/dmtimer for now. I'm open for suggestions on whether
> > I should generally push branches like this separately Linuswards
> > or better aggregate multiple standalone features into a single
> > branch.
>
> I'm adding the patch below to fix a trivial randconfig build regression
> in this series.
>
> Arnd
>
> 8<---
>
> Subject: [PATCH] ARM: omap: use __devexit_p in dmtimer driver
>
> The omap_dm_timer_remove function gets discarded when
> CONFIG_HOTPLUG is not set, so we must not reference it
> unconditionally.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Great, thanks!
Acked-by: Tony Lindgren <tony@atomide.com>
> diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
> index de7896f..2def4e1 100644
> --- a/arch/arm/plat-omap/dmtimer.c
> +++ b/arch/arm/plat-omap/dmtimer.c
> @@ -723,7 +723,7 @@ static int __devexit omap_dm_timer_remove(struct platform_device *pdev)
>
> static struct platform_driver omap_dm_timer_driver = {
> .probe = omap_dm_timer_probe,
> - .remove = omap_dm_timer_remove,
> + .remove = __devexit_p(omap_dm_timer_remove),
> .driver = {
> .name = "omap_timer",
> },
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2011-10-04 0:07 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-28 22:02 [GIT PULL] dmtimer changes for v3.2 merge window Tony Lindgren
2011-09-28 22:02 ` Tony Lindgren
2011-09-30 20:13 ` Arnd Bergmann
2011-09-30 20:13 ` Arnd Bergmann
2011-09-30 20:43 ` Tony Lindgren
2011-09-30 20:43 ` Tony Lindgren
2011-09-30 20:52 ` Arnd Bergmann
2011-09-30 20:52 ` Arnd Bergmann
2011-10-01 16:45 ` Arnd Bergmann
2011-10-01 16:45 ` Arnd Bergmann
2011-10-04 0:07 ` Tony Lindgren [this message]
2011-10-04 0:07 ` Tony Lindgren
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=20111004000743.GM6324@atomide.com \
--to=tony@atomide.com \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.