Commit f0d9ff8c authored by Randy Dunlap's avatar Randy Dunlap Committed by Herbert Xu
Browse files

hwrng: rename 'mod_init' & 'mod_exit' functions to be module-specific 



Rename module_init & module_exit functions that are named
"mod_init" and "mod_exit" so that they are unique in both the
System.map file and in initcall_debug output instead of showing
up as almost anonymous "mod_init".

This is helpful for debugging and in determining how long certain
module_init calls take to execute.

Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Andres Salomon <dilinger@queued.net>
Cc: linux-geode@lists.infradead.org
Cc: Matt Mackall <mpm@selenic.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: linux-crypto@vger.kernel.org
Cc: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent cb5f09e8

drivers/char/hw_random/amd-rng.c

+4 −4
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static struct hwrng amd_rng = { 
	.read		= amd_rng_read,

};



static int __init mod_init(void)

static int __init amd_rng_mod_init(void)

{

	int err;

	struct pci_dev *pdev = NULL;
@@ -188,7 +188,7 @@ static int __init mod_init(void) 
	return err;

}



static void __exit mod_exit(void)

static void __exit amd_rng_mod_exit(void)

{

	struct amd768_priv *priv;
@@ -203,8 +203,8 @@ static void __exit mod_exit(void) 
	kfree(priv);

}



module_init(mod_init);

module_exit(mod_exit);

module_init(amd_rng_mod_init);

module_exit(amd_rng_mod_exit);



MODULE_AUTHOR("The Linux Kernel team");

MODULE_DESCRIPTION("H/W RNG driver for AMD chipsets");

drivers/char/hw_random/geode-rng.c

+4 −4
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static struct hwrng geode_rng = { 
};





static int __init mod_init(void)

static int __init geode_rng_init(void)

{

	int err = -ENODEV;

	struct pci_dev *pdev = NULL;
@@ -124,7 +124,7 @@ static int __init mod_init(void) 
	goto out;

}



static void __exit mod_exit(void)

static void __exit geode_rng_exit(void)

{

	void __iomem *mem = (void __iomem *)geode_rng.priv;
@@ -132,8 +132,8 @@ static void __exit mod_exit(void) 
	iounmap(mem);

}



module_init(mod_init);

module_exit(mod_exit);

module_init(geode_rng_init);

module_exit(geode_rng_exit);



MODULE_DESCRIPTION("H/W RNG driver for AMD Geode LX CPUs");

MODULE_LICENSE("GPL");

drivers/char/hw_random/intel-rng.c

+4 −4
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ PFX "RNG, try using the 'no_fwh_detect' option.\n"; 
}





static int __init mod_init(void)

static int __init intel_rng_mod_init(void)

{

	int err = -ENODEV;

	int i;
@@ -403,7 +403,7 @@ static int __init mod_init(void) 


}



static void __exit mod_exit(void)

static void __exit intel_rng_mod_exit(void)

{

	void __iomem *mem = (void __iomem *)intel_rng.priv;
@@ -411,8 +411,8 @@ static void __exit mod_exit(void) 
	iounmap(mem);

}



module_init(mod_init);

module_exit(mod_exit);

module_init(intel_rng_mod_init);

module_exit(intel_rng_mod_exit);



MODULE_DESCRIPTION("H/W RNG driver for Intel chipsets");

MODULE_LICENSE("GPL");

drivers/char/hw_random/via-rng.c

+4 −4
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ static struct hwrng via_rng = { 
};





static int __init mod_init(void)

static int __init via_rng_mod_init(void)

{

	int err;
@@ -209,13 +209,13 @@ static int __init mod_init(void) 
out:

	return err;

}

module_init(mod_init);

module_init(via_rng_mod_init);



static void __exit mod_exit(void)

static void __exit via_rng_mod_exit(void)

{

	hwrng_unregister(&via_rng);

}

module_exit(mod_exit);

module_exit(via_rng_mod_exit);



static struct x86_cpu_id __maybe_unused via_rng_cpu_id[] = {

	X86_MATCH_FEATURE(X86_FEATURE_XSTORE, NULL),