hwrng: cavium - Use per device name to allow for multiple devices.

Systems containing the Cavium HW RNG may have one device per NUMA
node.  A typical configuration is a 2-node NUMA system, which results
in 2 RNG devices.  The hwrng subsystem refuses (and rightly so) to
register more than one device with he same name, so we get failure
messages on these systems.

Make the hwrng name unique by including the underlying device name.
Also remove spaces from the name to make it possible to switch devices
via the sysfs knobs.

Signed-off-by: David Daney <david.daney@cavium.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/char/hw_random/cavium-rng-vf.c b/drivers/char/hw_random/cavium-rng-vf.c
index 066ae0e78d63970be727f91c8d25255a1ada431b..dd1007aecb10ee674f0c6c6dbfd2ba452c5dbe40 100644 (file)
--- a/drivers/char/hw_random/cavium-rng-vf.c
+++ b/drivers/char/hw_random/cavium-rng-vf.c
@@ -57,7 +57,11 @@ static int cavium_rng_probe_vf(struct        pci_dev         *pdev,
                return -ENOMEM;
        }
 
-       rng->ops.name    = "cavium rng";
+       rng->ops.name = devm_kasprintf(&pdev->dev, GFP_KERNEL,
+                                      "cavium-rng-%s", dev_name(&pdev->dev));
+       if (!rng->ops.name)
+               return -ENOMEM;
+
        rng->ops.read    = cavium_rng_read;
        rng->ops.quality = 1000;