Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb4d84f1 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

ibm_newemac annotations (iomem, NULL noise) 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c6b44e50

drivers/net/ibm_newemac/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1950,7 +1950,7 @@ static u32 emac_ethtool_get_rx_csum(struct net_device *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)

drivers/net/ibm_newemac/rgmii.c

+6 −6
Original line number Diff line number Diff line
@@ -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)

{

	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);
@@ -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)

{

	struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev);

	struct rgmii_regs *p = dev->base;

	struct rgmii_regs __iomem *p = dev->base;

	u32 ssr;



	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)

{

	struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev);

	struct rgmii_regs *p = dev->base;

	struct rgmii_regs __iomem *p = dev->base;

	u32 fer;



	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)

{

	struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev);

	struct rgmii_regs *p = dev->base;

	struct rgmii_regs __iomem *p = dev->base;

	u32 fer;



	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)

{

	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);
@@ -242,7 +242,7 @@ static int __devinit rgmii_probe(struct of_device *ofdev, 
	}



	rc = -ENOMEM;

	dev->base = (struct rgmii_regs *)ioremap(regs.start,

	dev->base = (struct rgmii_regs __iomem *)ioremap(regs.start,

						 sizeof(struct rgmii_regs));

	if (dev->base == NULL) {

		printk(KERN_ERR "%s: Can't map device registers!\n",

drivers/net/ibm_newemac/tah.c

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ void __devexit tah_detach(struct of_device *ofdev, int channel) 
void tah_reset(struct of_device *ofdev)

{

	struct tah_instance *dev = dev_get_drvdata(&ofdev->dev);

	struct tah_regs *p = dev->base;

	struct tah_regs __iomem *p = dev->base;

	int n;



	/* Reset TAH */
@@ -108,7 +108,7 @@ static int __devinit tah_probe(struct of_device *ofdev, 
	}



	rc = -ENOMEM;

	dev->base = (struct tah_regs *)ioremap(regs.start,

	dev->base = (struct tah_regs __iomem *)ioremap(regs.start,

					       sizeof(struct tah_regs));

	if (dev->base == NULL) {

		printk(KERN_ERR "%s: Can't map device registers!\n",

drivers/net/ibm_newemac/zmii.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

{

	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);
@@ -250,7 +250,7 @@ static int __devinit zmii_probe(struct of_device *ofdev, 
	}



	rc = -ENOMEM;

	dev->base = (struct zmii_regs *)ioremap(regs.start,

	dev->base = (struct zmii_regs __iomem *)ioremap(regs.start,

						sizeof(struct zmii_regs));

	if (dev->base == NULL) {

		printk(KERN_ERR "%s: Can't map device registers!\n",