diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2007-10-14 14:36:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-14 15:41:52 -0400 |
commit | eb4d84f18598211ccfdecc0a7f14a048cb86e657 (patch) | |
tree | 0baff9c1bd5a93a85c014292d940e8db6e9bd719 /drivers/net/ibm_newemac/zmii.c | |
parent | c6b44e50b8958d9bfe3003c81e70d9a53852ae52 (diff) |
ibm_newemac annotations (iomem, NULL noise)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net/ibm_newemac/zmii.c')
-rw-r--r-- | drivers/net/ibm_newemac/zmii.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ibm_newemac/zmii.c b/drivers/net/ibm_newemac/zmii.c index d06312901848..2219ec2740e0 100644 --- a/drivers/net/ibm_newemac/zmii.c +++ b/drivers/net/ibm_newemac/zmii.c | |||
@@ -79,7 +79,7 @@ static inline u32 zmii_mode_mask(int mode, int input) | |||
79 | int __devinit zmii_attach(struct of_device *ofdev, int input, int *mode) | 79 | int __devinit zmii_attach(struct of_device *ofdev, int input, int *mode) |
80 | { | 80 | { |
81 | struct zmii_instance *dev = dev_get_drvdata(&ofdev->dev); | 81 | struct zmii_instance *dev = dev_get_drvdata(&ofdev->dev); |
82 | struct zmii_regs *p = dev->base; | 82 | struct zmii_regs __iomem *p = dev->base; |
83 | 83 | ||
84 | ZMII_DBG(dev, "init(%d, %d)" NL, input, *mode); | 84 | ZMII_DBG(dev, "init(%d, %d)" NL, input, *mode); |
85 | 85 | ||
@@ -250,7 +250,7 @@ static int __devinit zmii_probe(struct of_device *ofdev, | |||
250 | } | 250 | } |
251 | 251 | ||
252 | rc = -ENOMEM; | 252 | rc = -ENOMEM; |
253 | dev->base = (struct zmii_regs *)ioremap(regs.start, | 253 | dev->base = (struct zmii_regs __iomem *)ioremap(regs.start, |
254 | sizeof(struct zmii_regs)); | 254 | sizeof(struct zmii_regs)); |
255 | if (dev->base == NULL) { | 255 | if (dev->base == NULL) { |
256 | printk(KERN_ERR "%s: Can't map device registers!\n", | 256 | printk(KERN_ERR "%s: Can't map device registers!\n", |