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/rgmii.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/rgmii.c')
-rw-r--r-- | drivers/net/ibm_newemac/rgmii.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ibm_newemac/rgmii.c b/drivers/net/ibm_newemac/rgmii.c index 3f57d6cd26e2..de416951a435 100644 --- a/drivers/net/ibm_newemac/rgmii.c +++ b/drivers/net/ibm_newemac/rgmii.c | |||
@@ -84,7 +84,7 @@ static inline u32 rgmii_mode_mask(int mode, int input) | |||
84 | int __devinit rgmii_attach(struct of_device *ofdev, int input, int mode) | 84 | int __devinit rgmii_attach(struct of_device *ofdev, int input, int mode) |
85 | { | 85 | { |
86 | struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev); | 86 | struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev); |
87 | struct rgmii_regs *p = dev->base; | 87 | struct rgmii_regs __iomem *p = dev->base; |
88 | 88 | ||
89 | RGMII_DBG(dev, "attach(%d)" NL, input); | 89 | RGMII_DBG(dev, "attach(%d)" NL, input); |
90 | 90 | ||
@@ -113,7 +113,7 @@ int __devinit rgmii_attach(struct of_device *ofdev, int input, int mode) | |||
113 | void rgmii_set_speed(struct of_device *ofdev, int input, int speed) | 113 | void rgmii_set_speed(struct of_device *ofdev, int input, int speed) |
114 | { | 114 | { |
115 | struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev); | 115 | struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev); |
116 | struct rgmii_regs *p = dev->base; | 116 | struct rgmii_regs __iomem *p = dev->base; |
117 | u32 ssr; | 117 | u32 ssr; |
118 | 118 | ||
119 | mutex_lock(&dev->lock); | 119 | mutex_lock(&dev->lock); |
@@ -135,7 +135,7 @@ void rgmii_set_speed(struct of_device *ofdev, int input, int speed) | |||
135 | void rgmii_get_mdio(struct of_device *ofdev, int input) | 135 | void rgmii_get_mdio(struct of_device *ofdev, int input) |
136 | { | 136 | { |
137 | struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev); | 137 | struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev); |
138 | struct rgmii_regs *p = dev->base; | 138 | struct rgmii_regs __iomem *p = dev->base; |
139 | u32 fer; | 139 | u32 fer; |
140 | 140 | ||
141 | RGMII_DBG2(dev, "get_mdio(%d)" NL, input); | 141 | RGMII_DBG2(dev, "get_mdio(%d)" NL, input); |
@@ -156,7 +156,7 @@ void rgmii_get_mdio(struct of_device *ofdev, int input) | |||
156 | void rgmii_put_mdio(struct of_device *ofdev, int input) | 156 | void rgmii_put_mdio(struct of_device *ofdev, int input) |
157 | { | 157 | { |
158 | struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev); | 158 | struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev); |
159 | struct rgmii_regs *p = dev->base; | 159 | struct rgmii_regs __iomem *p = dev->base; |
160 | u32 fer; | 160 | u32 fer; |
161 | 161 | ||
162 | RGMII_DBG2(dev, "put_mdio(%d)" NL, input); | 162 | RGMII_DBG2(dev, "put_mdio(%d)" NL, input); |
@@ -177,7 +177,7 @@ void rgmii_put_mdio(struct of_device *ofdev, int input) | |||
177 | void __devexit rgmii_detach(struct of_device *ofdev, int input) | 177 | void __devexit rgmii_detach(struct of_device *ofdev, int input) |
178 | { | 178 | { |
179 | struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev); | 179 | struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev); |
180 | struct rgmii_regs *p = dev->base; | 180 | struct rgmii_regs __iomem *p = dev->base; |
181 | 181 | ||
182 | mutex_lock(&dev->lock); | 182 | mutex_lock(&dev->lock); |
183 | 183 | ||
@@ -242,7 +242,7 @@ static int __devinit rgmii_probe(struct of_device *ofdev, | |||
242 | } | 242 | } |
243 | 243 | ||
244 | rc = -ENOMEM; | 244 | rc = -ENOMEM; |
245 | dev->base = (struct rgmii_regs *)ioremap(regs.start, | 245 | dev->base = (struct rgmii_regs __iomem *)ioremap(regs.start, |
246 | sizeof(struct rgmii_regs)); | 246 | sizeof(struct rgmii_regs)); |
247 | if (dev->base == NULL) { | 247 | if (dev->base == NULL) { |
248 | printk(KERN_ERR "%s: Can't map device registers!\n", | 248 | printk(KERN_ERR "%s: Can't map device registers!\n", |