From: Tony Lindgren <tony@atomide.com>
To: Afzal Mohammed <afzal@ti.com>
Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] ARM: OMAP2+: dmtimer: Fix warning
Date: Thu, 6 Oct 2011 12:53:35 -0700 [thread overview]
Message-ID: <20111006195335.GO6324@atomide.com> (raw)
In-Reply-To: <1317278657-12414-1-git-send-email-afzal@ti.com>
* Afzal Mohammed <afzal@ti.com> [110928 23:10]:
> Fix,
>
> arch/arm/mach-omap2/timer.c: In function 'omap_timer_init':
> arch/arm/mach-omap2/timer.c:482: warning: assignment from incompatible pointer type
This should already be fixed when I merged together the
dt-base branch.
Regards,
Tony
> Signed-off-by: Afzal Mohammed <afzal@ti.com>
> ---
>
> Fix on tony/master
>
> arch/arm/mach-omap2/timer.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
> index 1140e98..e49fc7b 100644
> --- a/arch/arm/mach-omap2/timer.c
> +++ b/arch/arm/mach-omap2/timer.c
> @@ -434,7 +434,7 @@ static int __init omap_timer_init(struct omap_hwmod *oh, void *unused)
> int ret = 0;
> char *name = "omap_timer";
> struct dmtimer_platform_data *pdata;
> - struct omap_device *od;
> + struct platform_device *pdev;
> struct omap_timer_capability_dev_attr *timer_dev_attr;
> struct powerdomain *pwrdm;
>
> @@ -476,12 +476,12 @@ static int __init omap_timer_init(struct omap_hwmod *oh, void *unused)
> #ifdef CONFIG_PM
> pdata->get_context_loss_count = omap_pm_get_dev_context_loss_count;
> #endif
> - od = omap_device_build(name, id, oh, pdata, sizeof(*pdata),
> + pdev = omap_device_build(name, id, oh, pdata, sizeof(*pdata),
> omap2_dmtimer_latency,
> ARRAY_SIZE(omap2_dmtimer_latency),
> 0);
>
> - if (IS_ERR(od)) {
> + if (IS_ERR(pdev)) {
> pr_err("%s: Can't build omap_device for %s: %s.\n",
> __func__, name, oh->name);
> ret = -EINVAL;
> --
> 1.6.2.4
>
WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: OMAP2+: dmtimer: Fix warning
Date: Thu, 6 Oct 2011 12:53:35 -0700 [thread overview]
Message-ID: <20111006195335.GO6324@atomide.com> (raw)
In-Reply-To: <1317278657-12414-1-git-send-email-afzal@ti.com>
* Afzal Mohammed <afzal@ti.com> [110928 23:10]:
> Fix,
>
> arch/arm/mach-omap2/timer.c: In function 'omap_timer_init':
> arch/arm/mach-omap2/timer.c:482: warning: assignment from incompatible pointer type
This should already be fixed when I merged together the
dt-base branch.
Regards,
Tony
> Signed-off-by: Afzal Mohammed <afzal@ti.com>
> ---
>
> Fix on tony/master
>
> arch/arm/mach-omap2/timer.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
> index 1140e98..e49fc7b 100644
> --- a/arch/arm/mach-omap2/timer.c
> +++ b/arch/arm/mach-omap2/timer.c
> @@ -434,7 +434,7 @@ static int __init omap_timer_init(struct omap_hwmod *oh, void *unused)
> int ret = 0;
> char *name = "omap_timer";
> struct dmtimer_platform_data *pdata;
> - struct omap_device *od;
> + struct platform_device *pdev;
> struct omap_timer_capability_dev_attr *timer_dev_attr;
> struct powerdomain *pwrdm;
>
> @@ -476,12 +476,12 @@ static int __init omap_timer_init(struct omap_hwmod *oh, void *unused)
> #ifdef CONFIG_PM
> pdata->get_context_loss_count = omap_pm_get_dev_context_loss_count;
> #endif
> - od = omap_device_build(name, id, oh, pdata, sizeof(*pdata),
> + pdev = omap_device_build(name, id, oh, pdata, sizeof(*pdata),
> omap2_dmtimer_latency,
> ARRAY_SIZE(omap2_dmtimer_latency),
> 0);
>
> - if (IS_ERR(od)) {
> + if (IS_ERR(pdev)) {
> pr_err("%s: Can't build omap_device for %s: %s.\n",
> __func__, name, oh->name);
> ret = -EINVAL;
> --
> 1.6.2.4
>
next prev parent reply other threads:[~2011-10-06 19:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-29 6:44 [PATCH] ARM: OMAP2+: dmtimer: Fix warning Afzal Mohammed
2011-09-29 6:44 ` Afzal Mohammed
2011-10-06 19:53 ` Tony Lindgren [this message]
2011-10-06 19:53 ` 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=20111006195335.GO6324@atomide.com \
--to=tony@atomide.com \
--cc=afzal@ti.com \
--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.