fsl_pq_mdio: Fix compiler/sparse warnings (part 1)
Subsystems (2)
PATCH 1/3 fsl_pq_mdio: Fix compiler/sparse warnings (part 1)
commit 1d2397d742b7a2b39b2f09dd9da3b9d1463f55e9 ("fsl_pq_mdio: Add Suport for etsec2.0 devices") introduced the following warnings:
CHECK fsl_pq_mdio.c
fsl_pq_mdio.c:287:22: warning: incorrect type in initializer (different base types)
fsl_pq_mdio.c:287:22: expected unknown type 11 const *__mptr
fsl_pq_mdio.c:287:22: got unsigned long long [unsigned] [assigned] [usertype] addr
fsl_pq_mdio.c:287:19: warning: incorrect type in assignment (different base types)
fsl_pq_mdio.c:287:19: expected unsigned long long [unsigned] [usertype] ioremap_miimcfg
fsl_pq_mdio.c:287:19: got struct fsl_pq_mdio *<noident>
CC fsl_pq_mdio.ofsl_pq_mdio.c: In function 'fsl_pq_mdio_probe':
fsl_pq_mdio.c:287: warning: initialization makes pointer from integer without a cast fsl_pq_mdio.c:287: warning: assignment makes integer from pointer without a cast
These warnings are not easy to fix without ugly __force casts. So, instead of introducing the casts, rework the code to substitute an offset from an already mapped area. This makes the code a lot simpler and less duplicated.
Plus, from now on we don't actually map reserved registers on non-etsec2.0 devices, so we have more chances to catch programming errors.
--- drivers/net/fsl_pq_mdio.c | 31 ++++++++++++------------------- 1 files changed, 12 insertions(+), 19 deletions(-)
drivers/net/fsl_pq_mdio.c +12 -19
@@ -262,10 +262,11 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev,struct device_node *np = ofdev->node;struct device_node *tbi;struct fsl_pq_mdio __iomem *regs =NULL ; +void __iomem *map;u32 __iomem *tbipa;struct mii_bus *new_bus;int tbiaddr =-1 ; -u64 addr =0 , size =0 , ioremap_miimcfg =0 ; +u64 addr =0 , size =0 ;int err =0 ; new_bus =mdiobus_alloc ();
@@ -279,28 +280,20 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev,fsl_pq_mdio_bus_name (new_bus->id, np);/* Set the PHY base address */ -if (of_device_is_compatible (np,"fsl,gianfar-mdio" ) || -of_device_is_compatible (np,"fsl,gianfar-tbi" ) || -of_device_is_compatible (np,"fsl,ucc-mdio" ) || -of_device_is_compatible (np,"ucc_geth_phy" )) { - addr =of_translate_address (np,of_get_address (np,0 , &size,NULL )); - ioremap_miimcfg = container_of(addr, struct fsl_pq_mdio, miimcfg); - regs =ioremap (ioremap_miimcfg, size + - offsetof(struct fsl_pq_mdio , miimcfg)); - }else if (of_device_is_compatible (np,"fsl,etsec2-mdio" ) || -of_device_is_compatible (np,"fsl,etsec2-tbi" )) { - addr =of_translate_address (np,of_get_address (np,0 , &size,NULL )); - regs =ioremap (addr, size); - }else { - err = -EINVAL ; - goto err_free_bus; - } - -if (NULL == regs) { + addr =of_translate_address (np,of_get_address (np,0 , &size,NULL )); + map =ioremap (addr, size); +if (!map) { err = -ENOMEM ; goto err_free_bus; } +if (of_device_is_compatible (np,"fsl,gianfar-mdio" ) || +of_device_is_compatible (np,"fsl,gianfar-tbi" ) || +of_device_is_compatible (np,"fsl,ucc-mdio" ) || +of_device_is_compatible (np,"ucc_geth_phy" )) + map -= offsetof(struct fsl_pq_mdio , miimcfg); + regs = map; + new_bus->priv = (void __force *)regs; new_bus->irq =kcalloc (PHY_MAX_ADDR ,sizeof (int ),GFP_KERNEL );
Signature · 1 line
1.6.3.3
Quoted 108 lines
-----Original Message-----
From: Anton Vorontsov [mailto:[email protected]]
Sent: Thursday, November 05, 2009 4:23 AM
To: David Miller
Cc: Fleming Andy-AFLEMING; Kumar Gopalpet-B05799; [email protected]; [email protected]
Subject: [PATCH 1/3]fsl_pq_mdio: Fix compiler/sparse warnings (part 1)commit
1d2397d742b7a2b39b2f09dd9da3b9d1463f55e9("fsl_pq_mdio:
Add Suport for etsec2.0 devices") introduced the following warnings:CHECK
fsl_pq_mdio.c
fsl_pq_mdio.c:287:22: warning: incorrect type in initializer (different base types)
fsl_pq_mdio.c:287:22: expected unknown type 11 const*__mptr
fsl_pq_mdio.c:287:22: got unsigned long long [unsigned]
[assigned] [usertype] addr
fsl_pq_mdio.c:287:19: warning: incorrect type in assignment (different base types)
fsl_pq_mdio.c:287:19: expected unsigned long long
[unsigned] [usertype]ioremap_miimcfg
fsl_pq_mdio.c:287:19: got structfsl_pq_mdio*<noident>
CC fsl_pq_mdio.ofsl_pq_mdio.c: In function 'fsl_pq_mdio_probe':
fsl_pq_mdio.c:287: warning: initialization makes pointer from integer without a cast
fsl_pq_mdio.c:287: warning: assignment makes integer from pointer without a castThese warnings are not easy to fix without ugly
__forcecasts. So, instead of introducing the casts, rework the code to substitute an offset from an already mapped area. This makes the code a lot simpler and less duplicated.Plus, from now on we don't actually map reserved registers on non-etsec2.0 devices, so we have more chances to catch programming errors.
Signed-off-by Anton Vorontsov <[email protected]>---
drivers/net/fsl_pq_mdio.c| 31 ++++++++++++-------------------1 files changed, 12 insertions(+), 19 deletions(-)(quoted diff) +0
-0
b/drivers/net/fsl_pq_mdio.cindex 4065b7c..fb8c8d9 100644drivers/net/fsl_pq_mdio.c +2
-1@@ -262,10 +262,11 @@ static int fsl_pq_mdio_probe(structof_device *ofdev, struct device_node *np = ofdev->node;struct device_node *tbi;struct fsl_pq_mdio __iomem *regs =NULL ; +void __iomem *map;u32 __iomem *tbipa;struct mii_bus *new_bus;int tbiaddr =-1 ; -u64 addr =0 , size =0 , ioremap_miimcfg =0 ; +u64 addr =0 , size =0 ;int err =0 ;new_bus = mdiobus_alloc();drivers/net/fsl_pq_mdio.c +3
-18@@ -279,28 +280,20 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev,fsl_pq_mdio_bus_name (new_bus->id, np);/* Set the PHY base address */ -if (of_device_is_compatible (np,"fsl,gianfar-mdio" ) || -of_device_is_compatible (np,"fsl,gianfar-tbi" ) || -of_device_is_compatible (np,"fsl,ucc-mdio" ) || -of_device_is_compatible (np,"ucc_geth_phy" )) { - addr =of_translate_address (np, of_get_address(np, 0, &size, NULL)); - ioremap_miimcfg = container_of(addr, struct fsl_pq_mdio, miimcfg); - regs =ioremap (ioremap_miimcfg, size + - offsetof(struct fsl_pq_mdio , miimcfg)); - }else if (of_device_is_compatible (np,"fsl,etsec2-mdio" ) || -of_device_is_compatible (np,"fsl,etsec2-tbi" )) { - addr =of_translate_address (np, of_get_address(np, 0, &size, NULL)); - regs =ioremap (addr, size); - }else { - err = -EINVAL ; - goto err_free_bus; - } - -if (NULL == regs) { + addr =of_translate_address (np,of_get_address (np,0 , &size,NULL )); + map =ioremap (addr, size); +if (!map) { err = -ENOMEM ; goto err_free_bus;}drivers/net/fsl_pq_mdio.c +2
-0+if (of_device_is_compatible (np,"fsl,gianfar-mdio" ) || + of_device_is_compatible(np,"fsl,gianfar-tbi") ||
drivers/net/fsl_pq_mdio.c +5
-0+ of_device_is_compatible(np, "fsl,ucc-mdio") || + of_device_is_compatible(np, "ucc_geth_phy")) + map -= offsetof(struct fsl_pq_mdio , miimcfg); + regs = map; +new_bus->priv = (void __force *)regs; new_bus->irq = kcalloc(PHY_MAX_ADDR, sizeof(int), GFP_KERNEL);
Quoted 1 line
--
HI Anton, thanks for the changes. I have only one concern, has this code been tried for ucc_geth ? I remember I had some issues with getting the ucc_geth mdio also working. I will take in these changes and try at my end for ucc_geth.
-Thanks
Sandeep
Quoted 122 lines
-----Original Message-----
From: Kumar Gopalpet-B05799
Sent: Thursday, November 05, 2009 10:31 AM
To: 'Anton Vorontsov'
Cc: Fleming Andy-AFLEMING; [email protected]; [email protected]; David Miller
Subject: RE: [PATCH 1/3]fsl_pq_mdio: Fix compiler/sparse warnings (part 1)Quoted 7 lines
-----Original Message-----
From: Anton Vorontsov [mailto:[email protected]]
Sent: Thursday, November 05, 2009 4:23 AM
To: David Miller
Cc: Fleming Andy-AFLEMING; Kumar Gopalpet-B05799; [email protected]; [email protected]
Subject: [PATCH 1/3]fsl_pq_mdio: Fix compiler/sparsewarnings (part 1)
Quoted 6 lines
commit
1d2397d742b7a2b39b2f09dd9da3b9d1463f55e9("fsl_pq_mdio:
Add Suport for etsec2.0 devices") introduced the following warnings:CHECK
fsl_pq_mdio.c
fsl_pq_mdio.c:287:22: warning: incorrect type in initializer(different
Quoted 5 lines
base types)
fsl_pq_mdio.c:287:22: expected unknown type 11 const*__mptr
fsl_pq_mdio.c:287:22: got unsigned long long [unsigned]
[assigned] [usertype] addr
fsl_pq_mdio.c:287:19: warning: incorrect type in assignment(different
Quoted 11 lines
base types)
fsl_pq_mdio.c:287:19: expected unsigned long long
[unsigned] [usertype]ioremap_miimcfg
fsl_pq_mdio.c:287:19: got structfsl_pq_mdio*<noident>
CC fsl_pq_mdio.ofsl_pq_mdio.c: In function 'fsl_pq_mdio_probe':
fsl_pq_mdio.c:287: warning: initialization makes pointer from integer without a cast
fsl_pq_mdio.c:287: warning: assignment makes integer from pointer without a castQuoted 2 lines
These warnings are not easy to fix without ugly
__forcecasts. So, instead of introducing the casts, rework the code tosubstitute an
Quoted 74 lines
offset from an already mapped area. This makes the code a lot simpler and less duplicated.
Plus, from now on we don't actually map reserved registers on non-etsec2.0 devices, so we have more chances to catch programming errors.
Signed-off-by Anton Vorontsov <[email protected]>---
drivers/net/fsl_pq_mdio.c| 31 ++++++++++++-------------------1 files changed, 12 insertions(+), 19 deletions(-)drivers/net/fsl_pq_mdio.c +2
-1@@ -262,10 +262,11 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev, struct device_node *np = ofdev->node;struct device_node *tbi;struct fsl_pq_mdio __iomem *regs =NULL ; +void __iomem *map;u32 __iomem *tbipa;struct mii_bus *new_bus;int tbiaddr =-1 ; -u64 addr =0 , size =0 , ioremap_miimcfg =0 ; +u64 addr =0 , size =0 ;int err =0 ;new_bus = mdiobus_alloc();drivers/net/fsl_pq_mdio.c +3
-18@@ -279,28 +280,20 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev,fsl_pq_mdio_bus_name (new_bus->id, np);/* Set the PHY base address */ -if (of_device_is_compatible (np,"fsl,gianfar-mdio" ) || -of_device_is_compatible (np,"fsl,gianfar-tbi" ) || -of_device_is_compatible (np,"fsl,ucc-mdio" ) || -of_device_is_compatible (np,"ucc_geth_phy" )) { - addr =of_translate_address (np, of_get_address(np, 0, &size, NULL)); - ioremap_miimcfg = container_of(addr, struct fsl_pq_mdio, miimcfg); - regs =ioremap (ioremap_miimcfg, size + - offsetof(struct fsl_pq_mdio , miimcfg)); - }else if (of_device_is_compatible (np,"fsl,etsec2-mdio" ) || -of_device_is_compatible (np,"fsl,etsec2-tbi" )) { - addr =of_translate_address (np, of_get_address(np, 0, &size, NULL)); - regs =ioremap (addr, size); - }else { - err = -EINVAL ; - goto err_free_bus; - } - -if (NULL == regs) { + addr =of_translate_address (np,of_get_address (np,0 , &size,NULL )); + map =ioremap (addr, size); +if (!map) { err = -ENOMEM ; goto err_free_bus;}drivers/net/fsl_pq_mdio.c +2
-0+if (of_device_is_compatible (np,"fsl,gianfar-mdio" ) || + of_device_is_compatible(np,"fsl,gianfar-tbi") ||
drivers/net/fsl_pq_mdio.c +5
-0+ of_device_is_compatible(np, "fsl,ucc-mdio") || + of_device_is_compatible(np, "ucc_geth_phy")) + map -= offsetof(struct fsl_pq_mdio , miimcfg); + regs = map; +new_bus->priv = (void __force *)regs;
Quoted 7 lines
Quoted 2 lines
new_bus->irq = kcalloc(PHY_MAX_ADDR, sizeof(int), GFP_KERNEL);--
HI Anton, thanks for the changes. I have only one concern, has this code been tried for
ucc_geth? I remember I had some issues with getting theucc_gethmdio also working. I will take in these changes and try at my end forucc_geth.
Sorry, if my earlier statement was confusing. What I meant was with similar changes as Anton's changes
I had some issues with ucc_geth mdio ( may be Anton's changes don't have that issue).
--
Thanks
Sandeep
On Thu, Nov 05, 2009 at 11:11:56AM +0530, Kumar Gopalpet-B05799 wrote:
[...]
Quoted 9 lines
Quoted 4 lines
HI Anton, thanks for the changes. I have only one concern, has this code been tried for
ucc_geth? I remember I had some issues with getting theucc_gethmdio also working. I will take in these changes and try at my end forucc_geth.Sorry, if my earlier statement was confusing. What I meant was with similar changes as Anton's changes
I had some issues withucc_gethmdio ( may be Anton's changes don't have that issue).
Nope, I see no issues on MPC8360E-MDS using ucc_geth and fsl_pq_mdio drivers.
Thanks,
Signature · 3 lines
Anton Vorontsov email: [email protected] irc://irc.freenode.net/bd2
From: Anton Vorontsov <[email protected]>
Date: Thu, 5 Nov 2009 01:52:56 +0300
Quoted 2 lines
commit
1d2397d742b7a2b39b2f09dd9da3b9d1463f55e9("fsl_pq_mdio: Add Suport for etsec2.0 devices") introduced the following warnings:
...
Quoted 1 line
Signed-off-by Anton Vorontsov <[email protected]>
Applied.