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

Commit 5078ac79 authored by Timur Tabi's avatar Timur Tabi Committed by David S. Miller
Browse files

net/fsl_pq_mdio: various small fixes 



1) Replace printk with dev_err

2) Fix some whitespace mistakes

3) Rename "ofdev" to "pdev", since it's a platform_device now

4) Fix an inadvertent compound statement by replacing commas with semicolons

Signed-off-by: default avatarTimur Tabi <timur@freescale.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 69cfb419

drivers/net/ethernet/freescale/fsl_pq_mdio.c

+13 −14
Original line number Diff line number Diff line
@@ -155,8 +155,7 @@ static int fsl_pq_mdio_reset(struct mii_bus *bus) 
	mutex_unlock(&bus->mdio_lock);



	if (!status) {

		printk(KERN_ERR "%s: The MII Bus is stuck!\n",

				bus->name);

		dev_err(&bus->dev, "timeout waiting for MII bus\n");

		return -EBUSY;

	}
@@ -227,9 +226,9 @@ static int get_ucc_id_for_range(u64 start, u64 end, u32 *ucc_id) 
#endif

}



static int fsl_pq_mdio_probe(struct platform_device *ofdev)

static int fsl_pq_mdio_probe(struct platform_device *pdev)

{

	struct device_node *np = ofdev->dev.of_node;

	struct device_node *np = pdev->dev.of_node;

	struct device_node *tbi;

	struct fsl_pq_mdio_priv *priv;

	struct fsl_pq_mdio __iomem *regs = NULL;
@@ -252,9 +251,9 @@ static int fsl_pq_mdio_probe(struct platform_device *ofdev) 
	}



	new_bus->name = "Freescale PowerQUICC MII Bus",

	new_bus->read = &fsl_pq_mdio_read,

	new_bus->write = &fsl_pq_mdio_write,

	new_bus->reset = &fsl_pq_mdio_reset,

	new_bus->read = &fsl_pq_mdio_read;

	new_bus->write = &fsl_pq_mdio_write;

	new_bus->reset = &fsl_pq_mdio_reset;

	new_bus->priv = priv;



	addrp = of_get_address(np, 0, &size, NULL);
@@ -295,8 +294,8 @@ static int fsl_pq_mdio_probe(struct platform_device *ofdev) 
		goto err_unmap_regs;

	}



	new_bus->parent = &ofdev->dev;

	dev_set_drvdata(&ofdev->dev, new_bus);

	new_bus->parent = &pdev->dev;

	dev_set_drvdata(&pdev->dev, new_bus);



	if (of_device_is_compatible(np, "fsl,gianfar-mdio") ||

			of_device_is_compatible(np, "fsl,gianfar-tbi") ||
@@ -348,7 +347,7 @@ static int fsl_pq_mdio_probe(struct platform_device *ofdev) 


	err = of_mdiobus_register(new_bus, np);

	if (err) {

		printk (KERN_ERR "%s: Cannot register as MDIO bus\n",

		dev_err(&pdev->dev, "cannot register %s as MDIO bus\n",

			new_bus->name);

		goto err_free_irqs;

	}
@@ -367,9 +366,9 @@ static int fsl_pq_mdio_probe(struct platform_device *ofdev) 
}





static int fsl_pq_mdio_remove(struct platform_device *ofdev)

static int fsl_pq_mdio_remove(struct platform_device *pdev)

{

	struct device *device = &ofdev->dev;

	struct device *device = &pdev->dev;

	struct mii_bus *bus = dev_get_drvdata(device);

	struct fsl_pq_mdio_priv *priv = bus->priv;