github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-06 21:58:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

hwrng: intel - simplify intel_rng_mod_init()

Browse Source 
Return errors directly to simplify intel_rng_mod_init().

Signed-off-by: Thorsten Blum <blum@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Thorsten Blum 2026-10-06 19:26:27 +02:00 committed by Herbert Xu
parent 4921634ac0
commit cc29ce88b1
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/char/hw_random/intel-rng.c
View File

@ -327,7 +327,7 @@ static int __init intel_init_hw_struct(struct intel_rng_hw *intel_rng_hw,
static int __init intel_rng_mod_init(void)
{
int err = -ENODEV;
int err;
int i;
struct pci_dev *dev = NULL;
void __iomem *mem;
@ -339,7 +339,7 @@ static int __init intel_rng_mod_init(void)
NULL);
if (!dev)
goto out; /* Device not found. */
return -ENODEV;
if (no_fwh_detect < 0) {
pci_dev_put(dev);
@ -349,8 +349,7 @@ static int __init intel_rng_mod_init(void)
intel_rng_hw = kmalloc_obj(*intel_rng_hw);
if (!intel_rng_hw) {
pci_dev_put(dev);
err = -ENOMEM;
goto out;
return -ENOMEM;
}
err = intel_init_hw_struct(intel_rng_hw, dev);
@ -359,7 +358,7 @@ static int __init intel_rng_mod_init(void)
kfree(intel_rng_hw);
if (err == -ENODEV)
goto fwh_done;
goto out;
return err;
}
/*
@ -375,21 +374,19 @@ static int __init intel_rng_mod_init(void)
iounmap(intel_rng_hw->mem);
kfree(intel_rng_hw);
if (err)
goto out;
return err;
fwh_done:
err = -ENOMEM;
mem = ioremap(INTEL_RNG_ADDR, INTEL_RNG_ADDR_LEN);
if (!mem)
goto out;
return -ENOMEM;
intel_rng.priv = (unsigned long)mem;
/* Check for Random Number Generator */
err = -ENODEV;
hw_status = hwstatus_get(mem);
if ((hw_status & INTEL_RNG_PRESENT) == 0) {
iounmap(mem);
goto out;
return -ENODEV;
}
pr_info("Intel 82802 RNG detected\n");
@ -398,10 +395,10 @@ static int __init intel_rng_mod_init(void)
pr_err(PFX "RNG registering failed (%d)\n",
err);
iounmap(mem);
return err;
}
out:
return err;
return 0;
}
static void __exit intel_rng_mod_exit(void)