hwrng: cn10k - use dev_err_probe
authorMartin Kaiser <martin@kaiser.cx>
Fri, 21 Jul 2023 08:54:44 +0000 (10:54 +0200)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 28 Jul 2023 10:20:25 +0000 (18:20 +0800)
Use dev_err_probe in error paths of the probe function, making the code a
tiny bit simpler.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/char/hw_random/cn10k-rng.c

index 794ec77..3193531 100644 (file)
@@ -187,10 +187,8 @@ static int cn10k_rng_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        pci_set_drvdata(pdev, rng);
 
        rng->reg_base = pcim_iomap(pdev, 0, 0);
-       if (!rng->reg_base) {
-               dev_err(&pdev->dev, "Error while mapping CSRs, exiting\n");
-               return -ENOMEM;
-       }
+       if (!rng->reg_base)
+               return dev_err_probe(&pdev->dev, -ENOMEM, "Error while mapping CSRs, exiting\n");
 
        rng->ops.name = devm_kasprintf(&pdev->dev, GFP_KERNEL,
                                       "cn10k-rng-%s", dev_name(&pdev->dev));
@@ -205,10 +203,8 @@ static int cn10k_rng_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        reset_rng_health_state(rng);
 
        err = devm_hwrng_register(&pdev->dev, &rng->ops);
-       if (err) {
-               dev_err(&pdev->dev, "Could not register hwrng device.\n");
-               return err;
-       }
+       if (err)
+               return dev_err_probe(&pdev->dev, err, "Could not register hwrng device.\n");
 
        return 0;
 }