* [PATCH] Fix IO address issue.
@ 2008-10-10 9:05 Roman Tereshonkov
2008-10-10 9:09 ` Felipe Balbi
0 siblings, 1 reply; 5+ messages in thread
From: Roman Tereshonkov @ 2008-10-10 9:05 UTC (permalink / raw)
To: linux-omap; +Cc: Roman Tereshonkov
Signed-off-by: Roman Tereshonkov <roman.tereshonkov@nokia.com>
---
drivers/misc/sti/sdti.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/misc/sti/sdti.c b/drivers/misc/sti/sdti.c
index c35821d..2631ccf 100644
--- a/drivers/misc/sti/sdti.c
+++ b/drivers/misc/sti/sdti.c
@@ -32,7 +32,7 @@
#define CPU2_TRACE_EN 0x02
static struct clk *sdti_ck;
-unsigned long sti_base, sti_channel_base;
+void __iomem *sti_base, *sti_channel_base;
static DEFINE_SPINLOCK(sdti_lock);
void omap_sti_channel_write_trace(int len, int id, void *data,
@@ -137,14 +137,14 @@ static int __devinit omap_sdti_probe(struct platform_device *pdev)
}
size = res->end - res->start;
- sti_base = (unsigned long)ioremap(res->start, size);
+ sti_base = ioremap(res->start, size);
if (unlikely(!sti_base))
return -ENODEV;
size = cres->end - cres->start;
- sti_channel_base = (unsigned long)ioremap(cres->start, size);
+ sti_channel_base = ioremap(cres->start, size);
if (unlikely(!sti_channel_base)) {
- iounmap((void *)sti_base);
+ iounmap(sti_base);
return -ENODEV;
}
@@ -153,8 +153,8 @@ static int __devinit omap_sdti_probe(struct platform_device *pdev)
static int __devexit omap_sdti_remove(struct platform_device *pdev)
{
- iounmap((void *)sti_channel_base);
- iounmap((void *)sti_base);
+ iounmap(sti_channel_base);
+ iounmap(sti_base);
omap_sdti_exit();
return 0;
--
1.5.5.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] Fix IO address issue.
2008-10-10 9:05 [PATCH] Fix IO address issue Roman Tereshonkov
@ 2008-10-10 9:09 ` Felipe Balbi
2008-10-10 11:41 ` Tony Lindgren
0 siblings, 1 reply; 5+ messages in thread
From: Felipe Balbi @ 2008-10-10 9:09 UTC (permalink / raw)
To: ext Roman Tereshonkov; +Cc: linux-omap
On Fri, Oct 10, 2008 at 12:05:09PM +0300, Tereshonkov Roman wrote:
A patch description would be great here
>
> Signed-off-by: Roman Tereshonkov <roman.tereshonkov@nokia.com>
Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
> ---
> drivers/misc/sti/sdti.c | 12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/misc/sti/sdti.c b/drivers/misc/sti/sdti.c
> index c35821d..2631ccf 100644
> --- a/drivers/misc/sti/sdti.c
> +++ b/drivers/misc/sti/sdti.c
> @@ -32,7 +32,7 @@
> #define CPU2_TRACE_EN 0x02
>
> static struct clk *sdti_ck;
> -unsigned long sti_base, sti_channel_base;
> +void __iomem *sti_base, *sti_channel_base;
> static DEFINE_SPINLOCK(sdti_lock);
>
> void omap_sti_channel_write_trace(int len, int id, void *data,
> @@ -137,14 +137,14 @@ static int __devinit omap_sdti_probe(struct platform_device *pdev)
> }
>
> size = res->end - res->start;
> - sti_base = (unsigned long)ioremap(res->start, size);
> + sti_base = ioremap(res->start, size);
> if (unlikely(!sti_base))
> return -ENODEV;
>
> size = cres->end - cres->start;
> - sti_channel_base = (unsigned long)ioremap(cres->start, size);
> + sti_channel_base = ioremap(cres->start, size);
> if (unlikely(!sti_channel_base)) {
> - iounmap((void *)sti_base);
> + iounmap(sti_base);
> return -ENODEV;
> }
>
> @@ -153,8 +153,8 @@ static int __devinit omap_sdti_probe(struct platform_device *pdev)
>
> static int __devexit omap_sdti_remove(struct platform_device *pdev)
> {
> - iounmap((void *)sti_channel_base);
> - iounmap((void *)sti_base);
> + iounmap(sti_channel_base);
> + iounmap(sti_base);
> omap_sdti_exit();
>
> return 0;
> --
> 1.5.5.1
>
> --
> 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
--
balbi
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] Fix IO address issue.
2008-10-10 9:09 ` Felipe Balbi
@ 2008-10-10 11:41 ` Tony Lindgren
0 siblings, 0 replies; 5+ messages in thread
From: Tony Lindgren @ 2008-10-10 11:41 UTC (permalink / raw)
To: Felipe Balbi; +Cc: ext Roman Tereshonkov, linux-omap
* Felipe Balbi <felipe.balbi@nokia.com> [081010 12:24]:
> On Fri, Oct 10, 2008 at 12:05:09PM +0300, Tereshonkov Roman wrote:
>
> A patch description would be great here
>
> >
> > Signed-off-by: Roman Tereshonkov <roman.tereshonkov@nokia.com>
>
> Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
Pushing.
Tony
>
> > ---
> > drivers/misc/sti/sdti.c | 12 ++++++------
> > 1 files changed, 6 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/misc/sti/sdti.c b/drivers/misc/sti/sdti.c
> > index c35821d..2631ccf 100644
> > --- a/drivers/misc/sti/sdti.c
> > +++ b/drivers/misc/sti/sdti.c
> > @@ -32,7 +32,7 @@
> > #define CPU2_TRACE_EN 0x02
> >
> > static struct clk *sdti_ck;
> > -unsigned long sti_base, sti_channel_base;
> > +void __iomem *sti_base, *sti_channel_base;
> > static DEFINE_SPINLOCK(sdti_lock);
> >
> > void omap_sti_channel_write_trace(int len, int id, void *data,
> > @@ -137,14 +137,14 @@ static int __devinit omap_sdti_probe(struct platform_device *pdev)
> > }
> >
> > size = res->end - res->start;
> > - sti_base = (unsigned long)ioremap(res->start, size);
> > + sti_base = ioremap(res->start, size);
> > if (unlikely(!sti_base))
> > return -ENODEV;
> >
> > size = cres->end - cres->start;
> > - sti_channel_base = (unsigned long)ioremap(cres->start, size);
> > + sti_channel_base = ioremap(cres->start, size);
> > if (unlikely(!sti_channel_base)) {
> > - iounmap((void *)sti_base);
> > + iounmap(sti_base);
> > return -ENODEV;
> > }
> >
> > @@ -153,8 +153,8 @@ static int __devinit omap_sdti_probe(struct platform_device *pdev)
> >
> > static int __devexit omap_sdti_remove(struct platform_device *pdev)
> > {
> > - iounmap((void *)sti_channel_base);
> > - iounmap((void *)sti_base);
> > + iounmap(sti_channel_base);
> > + iounmap(sti_base);
> > omap_sdti_exit();
> >
> > return 0;
> > --
> > 1.5.5.1
> >
> > --
> > 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
>
> --
> balbi
> --
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] Fix IO address issue.
@ 2008-10-09 12:27 Roman Tereshonkov
2008-10-09 12:40 ` Felipe Balbi
0 siblings, 1 reply; 5+ messages in thread
From: Roman Tereshonkov @ 2008-10-09 12:27 UTC (permalink / raw)
To: linux-omap; +Cc: Roman Tereshonkov
Signed-off-by: Roman Tereshonkov <roman.tereshonkov@nokia.com>
---
drivers/misc/sti/sdti.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/misc/sti/sdti.c b/drivers/misc/sti/sdti.c
index c35821d..2631ccf 100644
--- a/drivers/misc/sti/sdti.c
+++ b/drivers/misc/sti/sdti.c
@@ -32,7 +32,7 @@
#define CPU2_TRACE_EN 0x02
static struct clk *sdti_ck;
-unsigned long sti_base, sti_channel_base;
+void __iomem sti_base, sti_channel_base;
static DEFINE_SPINLOCK(sdti_lock);
void omap_sti_channel_write_trace(int len, int id, void *data,
@@ -137,14 +137,14 @@ static int __devinit omap_sdti_probe(struct platform_device *pdev)
}
size = res->end - res->start;
- sti_base = (unsigned long)ioremap(res->start, size);
+ sti_base = ioremap(res->start, size);
if (unlikely(!sti_base))
return -ENODEV;
size = cres->end - cres->start;
- sti_channel_base = (unsigned long)ioremap(cres->start, size);
+ sti_channel_base = ioremap(cres->start, size);
if (unlikely(!sti_channel_base)) {
- iounmap((void *)sti_base);
+ iounmap(sti_base);
return -ENODEV;
}
@@ -153,8 +153,8 @@ static int __devinit omap_sdti_probe(struct platform_device *pdev)
static int __devexit omap_sdti_remove(struct platform_device *pdev)
{
- iounmap((void *)sti_channel_base);
- iounmap((void *)sti_base);
+ iounmap(sti_channel_base);
+ iounmap(sti_base);
omap_sdti_exit();
return 0;
--
1.5.5.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] Fix IO address issue.
2008-10-09 12:27 Roman Tereshonkov
@ 2008-10-09 12:40 ` Felipe Balbi
0 siblings, 0 replies; 5+ messages in thread
From: Felipe Balbi @ 2008-10-09 12:40 UTC (permalink / raw)
To: ext Roman Tereshonkov; +Cc: linux-omap
On Thu, Oct 09, 2008 at 03:27:29PM +0300, Tereshonkov Roman wrote:
>
> Signed-off-by: Roman Tereshonkov <roman.tereshonkov@nokia.com>
> ---
> drivers/misc/sti/sdti.c | 12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/misc/sti/sdti.c b/drivers/misc/sti/sdti.c
> index c35821d..2631ccf 100644
> --- a/drivers/misc/sti/sdti.c
> +++ b/drivers/misc/sti/sdti.c
> @@ -32,7 +32,7 @@
> #define CPU2_TRACE_EN 0x02
>
> static struct clk *sdti_ck;
> -unsigned long sti_base, sti_channel_base;
> +void __iomem sti_base, sti_channel_base;
this is wrong. They should be pointers
> static DEFINE_SPINLOCK(sdti_lock);
>
> void omap_sti_channel_write_trace(int len, int id, void *data,
> @@ -137,14 +137,14 @@ static int __devinit omap_sdti_probe(struct platform_device *pdev)
> }
>
> size = res->end - res->start;
> - sti_base = (unsigned long)ioremap(res->start, size);
> + sti_base = ioremap(res->start, size);
> if (unlikely(!sti_base))
> return -ENODEV;
>
> size = cres->end - cres->start;
> - sti_channel_base = (unsigned long)ioremap(cres->start, size);
> + sti_channel_base = ioremap(cres->start, size);
> if (unlikely(!sti_channel_base)) {
> - iounmap((void *)sti_base);
> + iounmap(sti_base);
> return -ENODEV;
> }
>
> @@ -153,8 +153,8 @@ static int __devinit omap_sdti_probe(struct platform_device *pdev)
>
> static int __devexit omap_sdti_remove(struct platform_device *pdev)
> {
> - iounmap((void *)sti_channel_base);
> - iounmap((void *)sti_base);
> + iounmap(sti_channel_base);
> + iounmap(sti_base);
> omap_sdti_exit();
>
> return 0;
> --
> 1.5.5.1
>
> --
> 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
--
balbi
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2008-10-10 11:41 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-10 9:05 [PATCH] Fix IO address issue Roman Tereshonkov
2008-10-10 9:09 ` Felipe Balbi
2008-10-10 11:41 ` Tony Lindgren
-- strict thread matches above, loose matches on Subject: below --
2008-10-09 12:27 Roman Tereshonkov
2008-10-09 12:40 ` Felipe Balbi
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.