korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-16 00:34:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

ibm_newemac annotations (iomem, NULL noise)

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Al Viro 2007-10-14 19:36:10 +01:00 committed by Linus Torvalds
parent c6b44e50b8
commit eb4d84f185
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ibm_newemac/core.c
View File

@ -1950,7 +1950,7 @@ static u32 emac_ethtool_get_rx_csum(struct net_device *ndev)
{ {
struct emac_instance *dev = netdev_priv(ndev); struct emac_instance *dev = netdev_priv(ndev);
return dev->tah_dev != 0; return dev->tah_dev != NULL;
} }
static int emac_get_regs_len(struct emac_instance *dev) static int emac_get_regs_len(struct emac_instance *dev)

12
drivers/net/ibm_newemac/rgmii.c
View File

@ -84,7 +84,7 @@ static inline u32 rgmii_mode_mask(int mode, int input)
int __devinit rgmii_attach(struct of_device *ofdev, int input, int mode) int __devinit rgmii_attach(struct of_device *ofdev, int input, int mode)
{ {
struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev); struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev);
struct rgmii_regs *p = dev->base; struct rgmii_regs __iomem *p = dev->base;
RGMII_DBG(dev, "attach(%d)" NL, input); RGMII_DBG(dev, "attach(%d)" NL, input);
@ -113,7 +113,7 @@ int __devinit rgmii_attach(struct of_device *ofdev, int input, int mode)
void rgmii_set_speed(struct of_device *ofdev, int input, int speed) void rgmii_set_speed(struct of_device *ofdev, int input, int speed)
{ {
struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev); struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev);
struct rgmii_regs *p = dev->base; struct rgmii_regs __iomem *p = dev->base;
u32 ssr; u32 ssr;
mutex_lock(&dev->lock); mutex_lock(&dev->lock);
@ -135,7 +135,7 @@ void rgmii_set_speed(struct of_device *ofdev, int input, int speed)
void rgmii_get_mdio(struct of_device *ofdev, int input) void rgmii_get_mdio(struct of_device *ofdev, int input)
{ {
struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev); struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev);
struct rgmii_regs *p = dev->base; struct rgmii_regs __iomem *p = dev->base;
u32 fer; u32 fer;
RGMII_DBG2(dev, "get_mdio(%d)" NL, input); RGMII_DBG2(dev, "get_mdio(%d)" NL, input);
@ -156,7 +156,7 @@ void rgmii_get_mdio(struct of_device *ofdev, int input)
void rgmii_put_mdio(struct of_device *ofdev, int input) void rgmii_put_mdio(struct of_device *ofdev, int input)
{ {
struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev); struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev);
struct rgmii_regs *p = dev->base; struct rgmii_regs __iomem *p = dev->base;
u32 fer; u32 fer;
RGMII_DBG2(dev, "put_mdio(%d)" NL, input); RGMII_DBG2(dev, "put_mdio(%d)" NL, input);
@ -177,7 +177,7 @@ void rgmii_put_mdio(struct of_device *ofdev, int input)
void __devexit rgmii_detach(struct of_device *ofdev, int input) void __devexit rgmii_detach(struct of_device *ofdev, int input)
{ {
struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev); struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev);
struct rgmii_regs *p = dev->base; struct rgmii_regs __iomem *p = dev->base;
mutex_lock(&dev->lock); mutex_lock(&dev->lock);
@ -242,7 +242,7 @@ static int __devinit rgmii_probe(struct of_device *ofdev,
} }
rc = -ENOMEM; rc = -ENOMEM;
dev->base = (struct rgmii_regs *)ioremap(regs.start, dev->base = (struct rgmii_regs __iomem *)ioremap(regs.start,
sizeof(struct rgmii_regs)); sizeof(struct rgmii_regs));
if (dev->base == NULL) { if (dev->base == NULL) {
printk(KERN_ERR "%s: Can't map device registers!\n", printk(KERN_ERR "%s: Can't map device registers!\n",

4
drivers/net/ibm_newemac/tah.c
View File

@ -42,7 +42,7 @@ void __devexit tah_detach(struct of_device *ofdev, int channel)
void tah_reset(struct of_device *ofdev) void tah_reset(struct of_device *ofdev)
{ {
struct tah_instance *dev = dev_get_drvdata(&ofdev->dev); struct tah_instance *dev = dev_get_drvdata(&ofdev->dev);
struct tah_regs *p = dev->base; struct tah_regs __iomem *p = dev->base;
int n; int n;
/* Reset TAH */ /* Reset TAH */
@ -108,7 +108,7 @@ static int __devinit tah_probe(struct of_device *ofdev,
} }
rc = -ENOMEM; rc = -ENOMEM;
dev->base = (struct tah_regs *)ioremap(regs.start, dev->base = (struct tah_regs __iomem *)ioremap(regs.start,
sizeof(struct tah_regs)); sizeof(struct tah_regs));
if (dev->base == NULL) { if (dev->base == NULL) {
printk(KERN_ERR "%s: Can't map device registers!\n", printk(KERN_ERR "%s: Can't map device registers!\n",

4
drivers/net/ibm_newemac/zmii.c
View File

@ -79,7 +79,7 @@ static inline u32 zmii_mode_mask(int mode, int input)
int __devinit zmii_attach(struct of_device *ofdev, int input, int *mode) int __devinit zmii_attach(struct of_device *ofdev, int input, int *mode)
{ {
struct zmii_instance *dev = dev_get_drvdata(&ofdev->dev); struct zmii_instance *dev = dev_get_drvdata(&ofdev->dev);
struct zmii_regs *p = dev->base; struct zmii_regs __iomem *p = dev->base;
ZMII_DBG(dev, "init(%d, %d)" NL, input, *mode); ZMII_DBG(dev, "init(%d, %d)" NL, input, *mode);
@ -250,7 +250,7 @@ static int __devinit zmii_probe(struct of_device *ofdev,
} }
rc = -ENOMEM; rc = -ENOMEM;
dev->base = (struct zmii_regs *)ioremap(regs.start, dev->base = (struct zmii_regs __iomem *)ioremap(regs.start,
sizeof(struct zmii_regs)); sizeof(struct zmii_regs));
if (dev->base == NULL) { if (dev->base == NULL) {
printk(KERN_ERR "%s: Can't map device registers!\n", printk(KERN_ERR "%s: Can't map device registers!\n",