Skip to content

Commit

Permalink
net/fsl_pq_mdio: various small fixes
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Timur Tabi authored and David S. Miller committed Aug 30, 2012
1 parent 69cfb41 commit 5078ac7
Showing 1 changed file with 13 additions and 14 deletions.
27 changes: 13 additions & 14 deletions drivers/net/ethernet/freescale/fsl_pq_mdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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
* 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, "gianfar")) {
enet_regs = (struct gfar __iomem *)regs;
Expand Down Expand Up @@ -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;
Expand All @@ -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);
Expand Down Expand Up @@ -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") ||
Expand Down Expand Up @@ -348,8 +347,8 @@ 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",
new_bus->name);
dev_err(&pdev->dev, "cannot register %s as MDIO bus\n",
new_bus->name);
goto err_free_irqs;
}

Expand All @@ -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;

Expand Down

0 comments on commit 5078ac7

Please sign in to comment.