Re: [PATCH net-next v1 1/5] ptp_ocp: use dev_err_probe()

From: Vadim Fedorenko
Date: Wed Jun 08 2022 - 17:46:28 EST


On 08.06.2022 13:03, Andy Shevchenko wrote:
Simplify the error path in ->probe() and unify message format a bit
by using dev_err_probe().

Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>

LGTM

Acked-by: Vadim Fedorenko <vfedorenko@xxxxxxxx>
---
drivers/ptp/ptp_ocp.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c
index 4519ef42b458..17930762fde9 100644
--- a/drivers/ptp/ptp_ocp.c
+++ b/drivers/ptp/ptp_ocp.c
@@ -3722,14 +3722,12 @@ ptp_ocp_probe(struct pci_dev *pdev, const struct pci_device_id *id)
int err;
devlink = devlink_alloc(&ptp_ocp_devlink_ops, sizeof(*bp), &pdev->dev);
- if (!devlink) {
- dev_err(&pdev->dev, "devlink_alloc failed\n");
- return -ENOMEM;
- }
+ if (!devlink)
+ return dev_err_probe(&pdev->dev, -ENOMEM, "devlink_alloc failed\n");
err = pci_enable_device(pdev);
if (err) {
- dev_err(&pdev->dev, "pci_enable_device\n");
+ dev_err_probe(&pdev->dev, err, "pci_enable_device\n");
goto out_free;
}
@@ -3745,7 +3743,7 @@ ptp_ocp_probe(struct pci_dev *pdev, const struct pci_device_id *id)
*/
err = pci_alloc_irq_vectors(pdev, 1, 17, PCI_IRQ_MSI | PCI_IRQ_MSIX);
if (err < 0) {
- dev_err(&pdev->dev, "alloc_irq_vectors err: %d\n", err);
+ dev_err_probe(&pdev->dev, err, "alloc_irq_vectors\n");
goto out;
}
bp->n_irqs = err;
@@ -3757,8 +3755,7 @@ ptp_ocp_probe(struct pci_dev *pdev, const struct pci_device_id *id)
bp->ptp = ptp_clock_register(&bp->ptp_info, &pdev->dev);
if (IS_ERR(bp->ptp)) {
- err = PTR_ERR(bp->ptp);
- dev_err(&pdev->dev, "ptp_clock_register: %d\n", err);
+ err = dev_err_probe(&pdev->dev, PTR_ERR(bp->ptp), "ptp_clock_register\n");
bp->ptp = NULL;
goto out;
}