diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2005-12-01 18:15:21 +0300 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2006-01-29 05:42:15 +0300 |
| commit | b43de2d8db7655d1c520bf6eac7071d8f6d0b864 (patch) | |
| tree | 72de2f56444a6a167fa61dff14946d1aa90b3bc8 /drivers/net/ibm_emac/ibm_emac_zmii.c | |
| parent | d0f6ecad39266f87913539c52dc624f75cc4b914 (diff) | |
| download | linux-b43de2d8db7655d1c520bf6eac7071d8f6d0b864.tar.xz | |
[PATCH] ibm_emac sparse annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/net/ibm_emac/ibm_emac_zmii.c')
| -rw-r--r-- | drivers/net/ibm_emac/ibm_emac_zmii.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ibm_emac/ibm_emac_zmii.c b/drivers/net/ibm_emac/ibm_emac_zmii.c index 35c1185079ed..e129e0aaa045 100644 --- a/drivers/net/ibm_emac/ibm_emac_zmii.c +++ b/drivers/net/ibm_emac/ibm_emac_zmii.c @@ -80,7 +80,7 @@ static inline u32 zmii_mode_mask(int mode, int input) static int __init zmii_init(struct ocp_device *ocpdev, int input, int *mode) { struct ibm_ocp_zmii *dev = ocp_get_drvdata(ocpdev); - struct zmii_regs *p; + struct zmii_regs __iomem *p; ZMII_DBG("%d: init(%d, %d)" NL, ocpdev->def->index, input, *mode); @@ -94,8 +94,7 @@ static int __init zmii_init(struct ocp_device *ocpdev, int input, int *mode) } dev->mode = PHY_MODE_NA; - p = (struct zmii_regs *)ioremap(ocpdev->def->paddr, - sizeof(struct zmii_regs)); + p = ioremap(ocpdev->def->paddr, sizeof(struct zmii_regs)); if (!p) { printk(KERN_ERR "zmii%d: could not ioremap device registers!\n", @@ -231,7 +230,7 @@ void __exit __zmii_fini(struct ocp_device *ocpdev, int input) if (!--dev->users) { /* Free everything if this is the last user */ ocp_set_drvdata(ocpdev, NULL); - iounmap((void *)dev->base); + iounmap(dev->base); kfree(dev); } } |