hwrng: intel - simplify intel_rng_mod_init()
Subsystems (2)
PATCH 1/1 hwrng: intel - simplify intel_rng_mod_init()
Return errors directly to simplify intel_rng_mod_init().
Signed-off-by Thorsten Blum <[email protected]>
--- drivers/char/hw_random/intel-rng.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)
drivers/char/hw_random/intel-rng.c +9 -12
@@ -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)
base-commit: 4c3ca7c8c152278332590bfd3df1b0f086364759
Herbert Xu
maintainerQuoted 6 lines · Thorsten Blum
Return errors directly to simplify
intel_rng_mod_init().Signed-off-by Thorsten Blum <[email protected]>--- drivers/char/hw_random/intel-rng.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)
Patch applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt