* [PATCH] i2c-iop3xx: add iomem annotation
@ 2010-11-28 16:07 Aaro Koskinen
[not found] ` <1290960420-7484-1-git-send-email-aaro.koskinen-X3B1VOXEql0@public.gmane.org>
0 siblings, 1 reply; 7+ messages in thread
From: Aaro Koskinen @ 2010-11-28 16:07 UTC (permalink / raw)
To: ben-linux, linux-i2c, linux-kernel; +Cc: aaro.koskinen
Eliminate unnecessary casts and the following sparse warnings:
drivers/i2c/busses/i2c-iop3xx.c:65:9: warning: incorrect type in argument 1 (different base types)
drivers/i2c/busses/i2c-iop3xx.c:65:9: expected void const volatile [noderef] <asn:2>*<noident>
drivers/i2c/busses/i2c-iop3xx.c:65:9: got unsigned int
[ the previous warning is repeated 18 times ]
drivers/i2c/busses/i2c-iop3xx.c:456:33: warning: cast removes address space of expression
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
---
drivers/i2c/busses/i2c-iop3xx.c | 6 +++---
drivers/i2c/busses/i2c-iop3xx.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c
index 112c61f..f09c931 100644
--- a/drivers/i2c/busses/i2c-iop3xx.c
+++ b/drivers/i2c/busses/i2c-iop3xx.c
@@ -409,7 +409,7 @@ iop3xx_i2c_remove(struct platform_device *pdev)
IOP3XX_ICR_RXFULL_IE | IOP3XX_ICR_TXEMPTY_IE);
__raw_writel(cr, adapter_data->ioaddr + CR_OFFSET);
- iounmap((void __iomem*)adapter_data->ioaddr);
+ iounmap(adapter_data->ioaddr);
release_mem_region(res->start, IOP3XX_I2C_IO_SIZE);
kfree(adapter_data);
kfree(padapter);
@@ -453,7 +453,7 @@ iop3xx_i2c_probe(struct platform_device *pdev)
/* set the adapter enumeration # */
adapter_data->id = i2c_id++;
- adapter_data->ioaddr = (u32)ioremap(res->start, IOP3XX_I2C_IO_SIZE);
+ adapter_data->ioaddr = ioremap(res->start, IOP3XX_I2C_IO_SIZE);
if (!adapter_data->ioaddr) {
ret = -ENOMEM;
goto release_region;
@@ -498,7 +498,7 @@ iop3xx_i2c_probe(struct platform_device *pdev)
return 0;
unmap:
- iounmap((void __iomem*)adapter_data->ioaddr);
+ iounmap(adapter_data->ioaddr);
release_region:
release_mem_region(res->start, IOP3XX_I2C_IO_SIZE);
diff --git a/drivers/i2c/busses/i2c-iop3xx.h b/drivers/i2c/busses/i2c-iop3xx.h
index 8485861..a63b9f1 100644
--- a/drivers/i2c/busses/i2c-iop3xx.h
+++ b/drivers/i2c/busses/i2c-iop3xx.h
@@ -97,7 +97,7 @@
#define IOP3XX_I2C_IO_SIZE 0x18
struct i2c_algo_iop3xx_data {
- u32 ioaddr;
+ char __iomem *ioaddr;
wait_queue_head_t waitq;
spinlock_t lock;
u32 SR_enabled, SR_received;
--
1.5.6.5
^ permalink raw reply related [flat|nested] 7+ messages in thread[parent not found: <1290960420-7484-1-git-send-email-aaro.koskinen-X3B1VOXEql0@public.gmane.org>]
* Re: [PATCH] i2c-iop3xx: add iomem annotation 2010-11-28 16:07 [PATCH] i2c-iop3xx: add iomem annotation Aaro Koskinen @ 2010-11-29 10:13 ` Marc Kleine-Budde 0 siblings, 0 replies; 7+ messages in thread From: Marc Kleine-Budde @ 2010-11-29 10:13 UTC (permalink / raw) To: Aaro Koskinen Cc: ben-linux-elnMNo+KYs3YtjvyW6yDsg, linux-i2c-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA [-- Attachment #1: Type: text/plain, Size: 2832 bytes --] On 11/28/2010 05:07 PM, Aaro Koskinen wrote: > Eliminate unnecessary casts and the following sparse warnings: > > drivers/i2c/busses/i2c-iop3xx.c:65:9: warning: incorrect type in argument 1 (different base types) > drivers/i2c/busses/i2c-iop3xx.c:65:9: expected void const volatile [noderef] <asn:2>*<noident> > drivers/i2c/busses/i2c-iop3xx.c:65:9: got unsigned int > > [ the previous warning is repeated 18 times ] > > drivers/i2c/busses/i2c-iop3xx.c:456:33: warning: cast removes address space of expression > > Signed-off-by: Aaro Koskinen <aaro.koskinen-X3B1VOXEql0@public.gmane.org> looks good, but use void __iomem * in struct i2c_algo_iop3xx_data. cheers, Marc > --- > drivers/i2c/busses/i2c-iop3xx.c | 6 +++--- > drivers/i2c/busses/i2c-iop3xx.h | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c > index 112c61f..f09c931 100644 > --- a/drivers/i2c/busses/i2c-iop3xx.c > +++ b/drivers/i2c/busses/i2c-iop3xx.c > @@ -409,7 +409,7 @@ iop3xx_i2c_remove(struct platform_device *pdev) > IOP3XX_ICR_RXFULL_IE | IOP3XX_ICR_TXEMPTY_IE); > __raw_writel(cr, adapter_data->ioaddr + CR_OFFSET); > > - iounmap((void __iomem*)adapter_data->ioaddr); > + iounmap(adapter_data->ioaddr); > release_mem_region(res->start, IOP3XX_I2C_IO_SIZE); > kfree(adapter_data); > kfree(padapter); > @@ -453,7 +453,7 @@ iop3xx_i2c_probe(struct platform_device *pdev) > /* set the adapter enumeration # */ > adapter_data->id = i2c_id++; > > - adapter_data->ioaddr = (u32)ioremap(res->start, IOP3XX_I2C_IO_SIZE); > + adapter_data->ioaddr = ioremap(res->start, IOP3XX_I2C_IO_SIZE); > if (!adapter_data->ioaddr) { > ret = -ENOMEM; > goto release_region; > @@ -498,7 +498,7 @@ iop3xx_i2c_probe(struct platform_device *pdev) > return 0; > > unmap: > - iounmap((void __iomem*)adapter_data->ioaddr); > + iounmap(adapter_data->ioaddr); > > release_region: > release_mem_region(res->start, IOP3XX_I2C_IO_SIZE); > diff --git a/drivers/i2c/busses/i2c-iop3xx.h b/drivers/i2c/busses/i2c-iop3xx.h > index 8485861..a63b9f1 100644 > --- a/drivers/i2c/busses/i2c-iop3xx.h > +++ b/drivers/i2c/busses/i2c-iop3xx.h > @@ -97,7 +97,7 @@ > #define IOP3XX_I2C_IO_SIZE 0x18 > > struct i2c_algo_iop3xx_data { > - u32 ioaddr; > + char __iomem *ioaddr; Use void __iomem *, please. > wait_queue_head_t waitq; > spinlock_t lock; > u32 SR_enabled, SR_received; cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 262 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] i2c-iop3xx: add iomem annotation @ 2010-11-29 10:13 ` Marc Kleine-Budde 0 siblings, 0 replies; 7+ messages in thread From: Marc Kleine-Budde @ 2010-11-29 10:13 UTC (permalink / raw) To: Aaro Koskinen; +Cc: ben-linux, linux-i2c, linux-kernel [-- Attachment #1: Type: text/plain, Size: 2810 bytes --] On 11/28/2010 05:07 PM, Aaro Koskinen wrote: > Eliminate unnecessary casts and the following sparse warnings: > > drivers/i2c/busses/i2c-iop3xx.c:65:9: warning: incorrect type in argument 1 (different base types) > drivers/i2c/busses/i2c-iop3xx.c:65:9: expected void const volatile [noderef] <asn:2>*<noident> > drivers/i2c/busses/i2c-iop3xx.c:65:9: got unsigned int > > [ the previous warning is repeated 18 times ] > > drivers/i2c/busses/i2c-iop3xx.c:456:33: warning: cast removes address space of expression > > Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> looks good, but use void __iomem * in struct i2c_algo_iop3xx_data. cheers, Marc > --- > drivers/i2c/busses/i2c-iop3xx.c | 6 +++--- > drivers/i2c/busses/i2c-iop3xx.h | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c > index 112c61f..f09c931 100644 > --- a/drivers/i2c/busses/i2c-iop3xx.c > +++ b/drivers/i2c/busses/i2c-iop3xx.c > @@ -409,7 +409,7 @@ iop3xx_i2c_remove(struct platform_device *pdev) > IOP3XX_ICR_RXFULL_IE | IOP3XX_ICR_TXEMPTY_IE); > __raw_writel(cr, adapter_data->ioaddr + CR_OFFSET); > > - iounmap((void __iomem*)adapter_data->ioaddr); > + iounmap(adapter_data->ioaddr); > release_mem_region(res->start, IOP3XX_I2C_IO_SIZE); > kfree(adapter_data); > kfree(padapter); > @@ -453,7 +453,7 @@ iop3xx_i2c_probe(struct platform_device *pdev) > /* set the adapter enumeration # */ > adapter_data->id = i2c_id++; > > - adapter_data->ioaddr = (u32)ioremap(res->start, IOP3XX_I2C_IO_SIZE); > + adapter_data->ioaddr = ioremap(res->start, IOP3XX_I2C_IO_SIZE); > if (!adapter_data->ioaddr) { > ret = -ENOMEM; > goto release_region; > @@ -498,7 +498,7 @@ iop3xx_i2c_probe(struct platform_device *pdev) > return 0; > > unmap: > - iounmap((void __iomem*)adapter_data->ioaddr); > + iounmap(adapter_data->ioaddr); > > release_region: > release_mem_region(res->start, IOP3XX_I2C_IO_SIZE); > diff --git a/drivers/i2c/busses/i2c-iop3xx.h b/drivers/i2c/busses/i2c-iop3xx.h > index 8485861..a63b9f1 100644 > --- a/drivers/i2c/busses/i2c-iop3xx.h > +++ b/drivers/i2c/busses/i2c-iop3xx.h > @@ -97,7 +97,7 @@ > #define IOP3XX_I2C_IO_SIZE 0x18 > > struct i2c_algo_iop3xx_data { > - u32 ioaddr; > + char __iomem *ioaddr; Use void __iomem *, please. > wait_queue_head_t waitq; > spinlock_t lock; > u32 SR_enabled, SR_received; cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 262 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] i2c-iop3xx: add iomem annotation 2010-11-28 16:07 [PATCH] i2c-iop3xx: add iomem annotation Aaro Koskinen @ 2010-12-03 1:59 ` Ben Dooks 0 siblings, 0 replies; 7+ messages in thread From: Ben Dooks @ 2010-12-03 1:59 UTC (permalink / raw) To: Aaro Koskinen Cc: ben-linux-elnMNo+KYs3YtjvyW6yDsg, linux-i2c-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA On Sun, Nov 28, 2010 at 06:07:00PM +0200, Aaro Koskinen wrote: > Eliminate unnecessary casts and the following sparse warnings: > > drivers/i2c/busses/i2c-iop3xx.c:65:9: warning: incorrect type in argument 1 (different base types) > drivers/i2c/busses/i2c-iop3xx.c:65:9: expected void const volatile [noderef] <asn:2>*<noident> > drivers/i2c/busses/i2c-iop3xx.c:65:9: got unsigned int > > [ the previous warning is repeated 18 times ] > > drivers/i2c/busses/i2c-iop3xx.c:456:33: warning: cast removes address space of expression > > Signed-off-by: Aaro Koskinen <aaro.koskinen-X3B1VOXEql0@public.gmane.org> > --- > drivers/i2c/busses/i2c-iop3xx.c | 6 +++--- > drivers/i2c/busses/i2c-iop3xx.h | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c > index 112c61f..f09c931 100644 > --- a/drivers/i2c/busses/i2c-iop3xx.c > +++ b/drivers/i2c/busses/i2c-iop3xx.c > @@ -409,7 +409,7 @@ iop3xx_i2c_remove(struct platform_device *pdev) > IOP3XX_ICR_RXFULL_IE | IOP3XX_ICR_TXEMPTY_IE); > __raw_writel(cr, adapter_data->ioaddr + CR_OFFSET); > > - iounmap((void __iomem*)adapter_data->ioaddr); > + iounmap(adapter_data->ioaddr); > release_mem_region(res->start, IOP3XX_I2C_IO_SIZE); > kfree(adapter_data); > kfree(padapter); > @@ -453,7 +453,7 @@ iop3xx_i2c_probe(struct platform_device *pdev) > /* set the adapter enumeration # */ > adapter_data->id = i2c_id++; > > - adapter_data->ioaddr = (u32)ioremap(res->start, IOP3XX_I2C_IO_SIZE); > + adapter_data->ioaddr = ioremap(res->start, IOP3XX_I2C_IO_SIZE); > if (!adapter_data->ioaddr) { > ret = -ENOMEM; > goto release_region; > @@ -498,7 +498,7 @@ iop3xx_i2c_probe(struct platform_device *pdev) > return 0; > > unmap: > - iounmap((void __iomem*)adapter_data->ioaddr); > + iounmap(adapter_data->ioaddr); > > release_region: > release_mem_region(res->start, IOP3XX_I2C_IO_SIZE); > diff --git a/drivers/i2c/busses/i2c-iop3xx.h b/drivers/i2c/busses/i2c-iop3xx.h > index 8485861..a63b9f1 100644 > --- a/drivers/i2c/busses/i2c-iop3xx.h > +++ b/drivers/i2c/busses/i2c-iop3xx.h > @@ -97,7 +97,7 @@ > #define IOP3XX_I2C_IO_SIZE 0x18 > > struct i2c_algo_iop3xx_data { > - u32 ioaddr; > + char __iomem *ioaddr; probably should be changed to void if possible without creating extra warnings. -- Ben Q: What's a light-year? A: One-third less calories than a regular year. ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] i2c-iop3xx: add iomem annotation @ 2010-12-03 1:59 ` Ben Dooks 0 siblings, 0 replies; 7+ messages in thread From: Ben Dooks @ 2010-12-03 1:59 UTC (permalink / raw) To: Aaro Koskinen; +Cc: ben-linux, linux-i2c, linux-kernel On Sun, Nov 28, 2010 at 06:07:00PM +0200, Aaro Koskinen wrote: > Eliminate unnecessary casts and the following sparse warnings: > > drivers/i2c/busses/i2c-iop3xx.c:65:9: warning: incorrect type in argument 1 (different base types) > drivers/i2c/busses/i2c-iop3xx.c:65:9: expected void const volatile [noderef] <asn:2>*<noident> > drivers/i2c/busses/i2c-iop3xx.c:65:9: got unsigned int > > [ the previous warning is repeated 18 times ] > > drivers/i2c/busses/i2c-iop3xx.c:456:33: warning: cast removes address space of expression > > Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> > --- > drivers/i2c/busses/i2c-iop3xx.c | 6 +++--- > drivers/i2c/busses/i2c-iop3xx.h | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c > index 112c61f..f09c931 100644 > --- a/drivers/i2c/busses/i2c-iop3xx.c > +++ b/drivers/i2c/busses/i2c-iop3xx.c > @@ -409,7 +409,7 @@ iop3xx_i2c_remove(struct platform_device *pdev) > IOP3XX_ICR_RXFULL_IE | IOP3XX_ICR_TXEMPTY_IE); > __raw_writel(cr, adapter_data->ioaddr + CR_OFFSET); > > - iounmap((void __iomem*)adapter_data->ioaddr); > + iounmap(adapter_data->ioaddr); > release_mem_region(res->start, IOP3XX_I2C_IO_SIZE); > kfree(adapter_data); > kfree(padapter); > @@ -453,7 +453,7 @@ iop3xx_i2c_probe(struct platform_device *pdev) > /* set the adapter enumeration # */ > adapter_data->id = i2c_id++; > > - adapter_data->ioaddr = (u32)ioremap(res->start, IOP3XX_I2C_IO_SIZE); > + adapter_data->ioaddr = ioremap(res->start, IOP3XX_I2C_IO_SIZE); > if (!adapter_data->ioaddr) { > ret = -ENOMEM; > goto release_region; > @@ -498,7 +498,7 @@ iop3xx_i2c_probe(struct platform_device *pdev) > return 0; > > unmap: > - iounmap((void __iomem*)adapter_data->ioaddr); > + iounmap(adapter_data->ioaddr); > > release_region: > release_mem_region(res->start, IOP3XX_I2C_IO_SIZE); > diff --git a/drivers/i2c/busses/i2c-iop3xx.h b/drivers/i2c/busses/i2c-iop3xx.h > index 8485861..a63b9f1 100644 > --- a/drivers/i2c/busses/i2c-iop3xx.h > +++ b/drivers/i2c/busses/i2c-iop3xx.h > @@ -97,7 +97,7 @@ > #define IOP3XX_I2C_IO_SIZE 0x18 > > struct i2c_algo_iop3xx_data { > - u32 ioaddr; > + char __iomem *ioaddr; probably should be changed to void if possible without creating extra warnings. -- Ben Q: What's a light-year? A: One-third less calories than a regular year. ^ permalink raw reply [flat|nested] 7+ messages in thread
[parent not found: <20101203015914.GC20097-SMNkleLxa3Z6Wcw2j4pizdi2O/JbrIOy@public.gmane.org>]
* Re: [PATCH] i2c-iop3xx: add iomem annotation 2010-12-03 1:59 ` Ben Dooks @ 2010-12-03 5:51 ` Aaro Koskinen -1 siblings, 0 replies; 7+ messages in thread From: Aaro Koskinen @ 2010-12-03 5:51 UTC (permalink / raw) To: Ben Dooks Cc: ben-linux-elnMNo+KYs3YtjvyW6yDsg, linux-i2c-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA Hi, On 3.12.2010, at 3.59, Ben Dooks wrote: > On Sun, Nov 28, 2010 at 06:07:00PM +0200, Aaro Koskinen wrote: >> Eliminate unnecessary casts and the following sparse warnings: [...] >> --- a/drivers/i2c/busses/i2c-iop3xx.h >> +++ b/drivers/i2c/busses/i2c-iop3xx.h >> @@ -97,7 +97,7 @@ >> #define IOP3XX_I2C_IO_SIZE 0x18 >> >> struct i2c_algo_iop3xx_data { >> - u32 ioaddr; >> + char __iomem *ioaddr; > > probably should be changed to void if possible without creating extra > warnings. Yes, the updated patch is here: https://patchwork.kernel.org/patch/ 363512/ A. ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] i2c-iop3xx: add iomem annotation @ 2010-12-03 5:51 ` Aaro Koskinen 0 siblings, 0 replies; 7+ messages in thread From: Aaro Koskinen @ 2010-12-03 5:51 UTC (permalink / raw) To: Ben Dooks; +Cc: ben-linux, linux-i2c, linux-kernel Hi, On 3.12.2010, at 3.59, Ben Dooks wrote: > On Sun, Nov 28, 2010 at 06:07:00PM +0200, Aaro Koskinen wrote: >> Eliminate unnecessary casts and the following sparse warnings: [...] >> --- a/drivers/i2c/busses/i2c-iop3xx.h >> +++ b/drivers/i2c/busses/i2c-iop3xx.h >> @@ -97,7 +97,7 @@ >> #define IOP3XX_I2C_IO_SIZE 0x18 >> >> struct i2c_algo_iop3xx_data { >> - u32 ioaddr; >> + char __iomem *ioaddr; > > probably should be changed to void if possible without creating extra > warnings. Yes, the updated patch is here: https://patchwork.kernel.org/patch/ 363512/ A. ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2010-12-03 5:51 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-28 16:07 [PATCH] i2c-iop3xx: add iomem annotation Aaro Koskinen
[not found] ` <1290960420-7484-1-git-send-email-aaro.koskinen-X3B1VOXEql0@public.gmane.org>
2010-11-29 10:13 ` Marc Kleine-Budde
2010-11-29 10:13 ` Marc Kleine-Budde
2010-12-03 1:59 ` Ben Dooks
2010-12-03 1:59 ` Ben Dooks
[not found] ` <20101203015914.GC20097-SMNkleLxa3Z6Wcw2j4pizdi2O/JbrIOy@public.gmane.org>
2010-12-03 5:51 ` Aaro Koskinen
2010-12-03 5:51 ` Aaro Koskinen
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.