2023-07-21 09:11:23

by Martin Kaiser

Subject: [PATCH 0/2] hwrng: cn10k - trivial cleanups

Two trivial cleanups of the cn10k driver. Compile tested only.

Martin Kaiser (2):
hwrng: cn10k - delete empty remove function
hwrng: cn10k - use dev_err_probe

drivers/char/hw_random/cn10k-rng.c | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)

--
2.30.2

2023-07-21 09:11:32

by Martin Kaiser

Subject: [PATCH 1/2] hwrng: cn10k - delete empty remove function

The remove function is empty, we can delete it. It's ok for a PCI driver
to have no remove function.

Signed-off-by: Martin Kaiser <[email protected]>
---
drivers/char/hw_random/cn10k-rng.c | 6 ------
1 file changed, 6 deletions(-)

diff --git a/drivers/char/hw_random/cn10k-rng.c b/drivers/char/hw_random/cn10k-rng.c
index 0cd7e1a8e499..794ec77feb2c 100644
--- a/drivers/char/hw_random/cn10k-rng.c
+++ b/drivers/char/hw_random/cn10k-rng.c
@@ -213,11 +213,6 @@ static int cn10k_rng_probe(struct pci_dev *pdev, const struct pci_device_id *id)
return 0;
}

-static void cn10k_rng_remove(struct pci_dev *pdev)
-{
- /* Nothing to do */
-}
-
static const struct pci_device_id cn10k_rng_id_table[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_CAVIUM, 0xA098) }, /* RNG PF */
{0,},
@@ -229,7 +224,6 @@ static struct pci_driver cn10k_rng_driver = {
.name = "cn10k_rng",
.id_table = cn10k_rng_id_table,
.probe = cn10k_rng_probe,
- .remove = cn10k_rng_remove,
};

module_pci_driver(cn10k_rng_driver);
--
2.30.2

2023-07-21 09:11:33

by Martin Kaiser

Subject: [PATCH 2/2] hwrng: cn10k - use dev_err_probe

Use dev_err_probe in error paths of the probe function, making the code a
tiny bit simpler.

Signed-off-by: Martin Kaiser <[email protected]>
---
drivers/char/hw_random/cn10k-rng.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/char/hw_random/cn10k-rng.c b/drivers/char/hw_random/cn10k-rng.c
index 794ec77feb2c..31935316a160 100644
--- a/drivers/char/hw_random/cn10k-rng.c
+++ b/drivers/char/hw_random/cn10k-rng.c
@@ -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;
}
--
2.30.2

2023-07-28 10:34:12

by Herbert Xu

Subject: Re: [PATCH 0/2] hwrng: cn10k - trivial cleanups

On Fri, Jul 21, 2023 at 10:54:42AM +0200, Martin Kaiser wrote:
> Two trivial cleanups of the cn10k driver. Compile tested only.
>
> Martin Kaiser (2):
> hwrng: cn10k - delete empty remove function
> hwrng: cn10k - use dev_err_probe
>
> drivers/char/hw_random/cn10k-rng.c | 18 ++++--------------
> 1 file changed, 4 insertions(+), 14 deletions(-)

All applied. Thanks.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt