leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net/fsl_pq_mdio: various small fixes

Browse Source 
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: Timur Tabi <timur@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Timur Tabi 2012-08-29 08:08:00 +00:00 committed by David S. Miller
parent 69cfb41941
commit 5078ac7958
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/net/ethernet/freescale/fsl_pq_mdio.c
View File

@ -155,8 +155,7 @@ static int fsl_pq_mdio_reset(struct mii_bus *bus)
mutex_unlock(&bus->mdio_lock); mutex_unlock(&bus->mdio_lock);
if (!status) { if (!status) {
printk(KERN_ERR "%s: The MII Bus is stuck!\n", dev_err(&bus->dev, "timeout waiting for MII bus\n");
bus->name);
return -EBUSY; return -EBUSY;
} }
@ -173,7 +172,7 @@ static u32 __iomem *get_gfar_tbipa(struct fsl_pq_mdio __iomem *regs, struct devi
* Also, we have to cast back to struct gfar because of * Also, we have to cast back to struct gfar because of
* definition weirdness done in gianfar.h. * definition weirdness done in gianfar.h.
*/ */
if(of_device_is_compatible(np, "fsl,gianfar-mdio") || if (of_device_is_compatible(np, "fsl,gianfar-mdio") ||
of_device_is_compatible(np, "fsl,gianfar-tbi") || of_device_is_compatible(np, "fsl,gianfar-tbi") ||
of_device_is_compatible(np, "gianfar")) { of_device_is_compatible(np, "gianfar")) {
enet_regs = (struct gfar __iomem *)regs; enet_regs = (struct gfar __iomem *)regs;
@ -227,9 +226,9 @@ static int get_ucc_id_for_range(u64 start, u64 end, u32 *ucc_id)
#endif #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 device_node *tbi;
struct fsl_pq_mdio_priv *priv; struct fsl_pq_mdio_priv *priv;
struct fsl_pq_mdio __iomem *regs = NULL; 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->name = "Freescale PowerQUICC MII Bus",
new_bus->read = &fsl_pq_mdio_read, new_bus->read = &fsl_pq_mdio_read;
new_bus->write = &fsl_pq_mdio_write, new_bus->write = &fsl_pq_mdio_write;
new_bus->reset = &fsl_pq_mdio_reset, new_bus->reset = &fsl_pq_mdio_reset;
new_bus->priv = priv; new_bus->priv = priv;
addrp = of_get_address(np, 0, &size, NULL); 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; goto err_unmap_regs;
} }
new_bus->parent = &ofdev->dev; new_bus->parent = &pdev->dev;
dev_set_drvdata(&ofdev->dev, new_bus); dev_set_drvdata(&pdev->dev, new_bus);
if (of_device_is_compatible(np, "fsl,gianfar-mdio") || if (of_device_is_compatible(np, "fsl,gianfar-mdio") ||
of_device_is_compatible(np, "fsl,gianfar-tbi") || of_device_is_compatible(np, "fsl,gianfar-tbi") ||
@ -348,8 +347,8 @@ static int fsl_pq_mdio_probe(struct platform_device *ofdev)
err = of_mdiobus_register(new_bus, np); err = of_mdiobus_register(new_bus, np);
if (err) { 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); new_bus->name);
goto err_free_irqs; goto err_free_irqs;
} }
@ -367,9 +366,9 @@ err_free_priv:
} }
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 mii_bus *bus = dev_get_drvdata(device);
struct fsl_pq_mdio_priv *priv = bus->priv; struct fsl_pq_mdio_priv *priv = bus->priv;