All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ARM: OMAP2+: dmtimer: Fix warning
@ 2011-09-29  6:44 ` Afzal Mohammed
  0 siblings, 0 replies; 4+ messages in thread
From: Afzal Mohammed @ 2011-09-29  6:44 UTC (permalink / raw)
  To: tony; +Cc: linux-omap, linux-arm-kernel, Afzal Mohammed

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

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


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH] ARM: OMAP2+: dmtimer: Fix warning
@ 2011-09-29  6:44 ` Afzal Mohammed
  0 siblings, 0 replies; 4+ messages in thread
From: Afzal Mohammed @ 2011-09-29  6:44 UTC (permalink / raw)
  To: linux-arm-kernel

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

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

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH] ARM: OMAP2+: dmtimer: Fix warning
  2011-09-29  6:44 ` Afzal Mohammed
@ 2011-10-06 19:53   ` Tony Lindgren
  -1 siblings, 0 replies; 4+ messages in thread
From: Tony Lindgren @ 2011-10-06 19:53 UTC (permalink / raw)
  To: Afzal Mohammed; +Cc: linux-omap, linux-arm-kernel

* 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
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [PATCH] ARM: OMAP2+: dmtimer: Fix warning
@ 2011-10-06 19:53   ` Tony Lindgren
  0 siblings, 0 replies; 4+ messages in thread
From: Tony Lindgren @ 2011-10-06 19:53 UTC (permalink / raw)
  To: linux-arm-kernel

* 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
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-10-06 19:53 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2011-10-06 19:53   ` Tony Lindgren

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.