From 7627fc074b9f7d2b0833f4f83c6b8e432d9f303e Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Wed, 5 Nov 2014 12:27:29 +0200 Subject: [PATCH] stmmac: pci: convert to use dev_* macros Instead of pr_* macros let's use dev_* macros which provide device name. Signed-off-by: Andy Shevchenko Signed-off-by: David S. Miller --- drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c index 5357a3f2b883..5084699baeab 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c @@ -78,8 +78,8 @@ static int stmmac_pci_probe(struct pci_dev *pdev, /* Enable pci device */ ret = pcim_enable_device(pdev); if (ret) { - pr_err("%s : ERROR: failed to enable %s device\n", __func__, - pci_name(pdev)); + dev_err(&pdev->dev, "%s: ERROR: failed to enable device\n", + __func__); return ret; } @@ -100,7 +100,7 @@ static int stmmac_pci_probe(struct pci_dev *pdev, priv = stmmac_dvr_probe(&pdev->dev, &plat_dat, pcim_iomap_table(pdev)[i]); if (IS_ERR(priv)) { - pr_err("%s: main driver probe failed", __func__); + dev_err(&pdev->dev, "%s: main driver probe failed\n", __func__); return PTR_ERR(priv); } priv->dev->irq = pdev->irq; @@ -108,7 +108,7 @@ static int stmmac_pci_probe(struct pci_dev *pdev, pci_set_drvdata(pdev, priv->dev); - pr_debug("STMMAC platform driver registration completed"); + dev_dbg(&pdev->dev, "STMMAC PCI driver registration completed\n"); return 0; }